kevin/linux
1
Fork 0
Code

w1: gpio: Don't use platform data for driver data

Browse Source 
struct device's .platform_data isn't for drivers to write to. For
driver-specific data there is .driver_data instead.

As there is no in-tree platform that provides w1_gpio_platform_data,
drop the include file and replace it by a local struct w1_gpio_ddata.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/8f7ebe03ddaa5a5c6e2b36fecdf59da7fc373527.1701727212.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Uwe Kleine-König 2023-12-04 23:05:21 +01:00 committed by Krzysztof Kozlowski
parent 271c819358
commit 9c0a5b3f9e
2 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/w1/masters/w1-gpio.c
View File

@ -9,7 +9,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/w1-gpio.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/err.h> #include <linux/err.h>
@ -18,9 +17,16 @@
#include <linux/w1.h> #include <linux/w1.h>
struct w1_gpio_ddata {
struct gpio_desc *gpiod;
struct gpio_desc *pullup_gpiod;
void (*enable_external_pullup)(int enable);
unsigned int pullup_duration;
};
static u8 w1_gpio_set_pullup(void *data, int delay) static u8 w1_gpio_set_pullup(void *data, int delay)
{ {
struct w1_gpio_platform_data *pdata = data; struct w1_gpio_ddata *pdata = data;
if (delay) { if (delay) {
pdata->pullup_duration = delay; pdata->pullup_duration = delay;
@ -46,14 +52,14 @@ static u8 w1_gpio_set_pullup(void *data, int delay)
static void w1_gpio_write_bit(void *data, u8 bit) static void w1_gpio_write_bit(void *data, u8 bit)
{ {
struct w1_gpio_platform_data *pdata = data; struct w1_gpio_ddata *pdata = data;
gpiod_set_value(pdata->gpiod, bit); gpiod_set_value(pdata->gpiod, bit);
} }
static u8 w1_gpio_read_bit(void *data) static u8 w1_gpio_read_bit(void *data)
{ {
struct w1_gpio_platform_data *pdata = data; struct w1_gpio_ddata *pdata = data;
return gpiod_get_value(pdata->gpiod) ? 1 : 0; return gpiod_get_value(pdata->gpiod) ? 1 : 0;
} }
@ -69,14 +75,13 @@ MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);
static int w1_gpio_probe(struct platform_device *pdev) static int w1_gpio_probe(struct platform_device *pdev)
{ {
struct w1_bus_master *master; struct w1_bus_master *master;
struct w1_gpio_platform_data *pdata; struct w1_gpio_ddata *pdata;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
/* Enforce open drain mode by default */ /* Enforce open drain mode by default */
enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN; enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
int err; int err;
if (of_have_populated_dt()) {
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
@ -90,15 +95,6 @@ static int w1_gpio_probe(struct platform_device *pdev)
if (of_property_present(np, "linux,open-drain")) if (of_property_present(np, "linux,open-drain"))
gflags = GPIOD_OUT_LOW; gflags = GPIOD_OUT_LOW;
pdev->dev.platform_data = pdata;
}
pdata = dev_get_platdata(dev);
if (!pdata) {
dev_err(dev, "No configuration data\n");
return -ENXIO;
}
master = devm_kzalloc(dev, sizeof(struct w1_bus_master), master = devm_kzalloc(dev, sizeof(struct w1_bus_master),
GFP_KERNEL); GFP_KERNEL);
if (!master) if (!master)
@ -152,7 +148,7 @@ static int w1_gpio_probe(struct platform_device *pdev)
static int w1_gpio_remove(struct platform_device *pdev) static int w1_gpio_remove(struct platform_device *pdev)
{ {
struct w1_bus_master *master = platform_get_drvdata(pdev); struct w1_bus_master *master = platform_get_drvdata(pdev);
struct w1_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev); struct w1_gpio_ddata *pdata = master->data;
if (pdata->enable_external_pullup) if (pdata->enable_external_pullup)
pdata->enable_external_pullup(0); pdata->enable_external_pullup(0);
@ -167,7 +163,8 @@ static int w1_gpio_remove(struct platform_device *pdev)
static int __maybe_unused w1_gpio_suspend(struct device *dev) static int __maybe_unused w1_gpio_suspend(struct device *dev)
{ {
struct w1_gpio_platform_data *pdata = dev_get_platdata(dev); struct w1_bus_master *master = dev_get_drvdata(dev);
struct w1_gpio_ddata *pdata = master->data;
if (pdata->enable_external_pullup) if (pdata->enable_external_pullup)
pdata->enable_external_pullup(0); pdata->enable_external_pullup(0);
@ -177,7 +174,8 @@ static int __maybe_unused w1_gpio_suspend(struct device *dev)
static int __maybe_unused w1_gpio_resume(struct device *dev) static int __maybe_unused w1_gpio_resume(struct device *dev)
{ {
struct w1_gpio_platform_data *pdata = dev_get_platdata(dev); struct w1_bus_master *master = dev_get_drvdata(dev);
struct w1_gpio_ddata *pdata = master->data;
if (pdata->enable_external_pullup) if (pdata->enable_external_pullup)
pdata->enable_external_pullup(1); pdata->enable_external_pullup(1);

22
include/linux/w1-gpio.h
View File

@ -1,22 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* w1-gpio interface to platform code
*
* Copyright (C) 2007 Ville Syrjala <syrjala@sci.fi>
*/
#ifndef _LINUX_W1_GPIO_H
#define _LINUX_W1_GPIO_H
struct gpio_desc;
/**
* struct w1_gpio_platform_data - Platform-dependent data for w1-gpio
*/
struct w1_gpio_platform_data {
struct gpio_desc *gpiod;
struct gpio_desc *pullup_gpiod;
void (*enable_external_pullup)(int enable);
unsigned int pullup_duration;
};
#endif /* _LINUX_W1_GPIO_H */