leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (gpio-fan) Mandate OF_GPIO and cut pdata path

Browse Source 
We have no users of platform data, we made platform data driver-local,
so cut all #ifdefs for the platform data case, and depend on the
Kconfig CONFIG_OF_GPIO symbol.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Linus Walleij
2017-09-26 01:09:07 +02:00
committed by Guenter Roeck
parent 8c0eb9bc52
commit a9b4c8afcd
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hwmon/Kconfig
View File

@@ -552,6 +552,7 @@ config SENSORS_G762
config SENSORS_GPIO_FAN config SENSORS_GPIO_FAN
tristate "GPIO fan" tristate "GPIO fan"
depends on OF_GPIO
depends on GPIOLIB || COMPILE_TEST depends on GPIOLIB || COMPILE_TEST
depends on THERMAL || THERMAL=n depends on THERMAL || THERMAL=n
help help

36
drivers/hwmon/gpio-fan.c
View File

@@ -453,7 +453,6 @@ static const struct thermal_cooling_device_ops gpio_fan_cool_ops = {
.set_cur_state = gpio_fan_set_cur_state, .set_cur_state = gpio_fan_set_cur_state,
}; };
#ifdef CONFIG_OF_GPIO
/* /*
* Translate OpenFirmware node properties into platform_data * Translate OpenFirmware node properties into platform_data
*/ */
@@ -556,7 +555,6 @@ static const struct of_device_id of_gpio_fan_match[] = {
{}, {},
}; };
MODULE_DEVICE_TABLE(of, of_gpio_fan_match); MODULE_DEVICE_TABLE(of, of_gpio_fan_match);
#endif /* CONFIG_OF_GPIO */
static int gpio_fan_probe(struct platform_device *pdev) static int gpio_fan_probe(struct platform_device *pdev)
{ {
@@ -564,29 +562,22 @@ static int gpio_fan_probe(struct platform_device *pdev)
struct gpio_fan_data *fan_data; struct gpio_fan_data *fan_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct gpio_fan_platform_data *pdata = dev_get_platdata(dev); struct gpio_fan_platform_data *pdata;
fan_data = devm_kzalloc(dev, sizeof(struct gpio_fan_data), fan_data = devm_kzalloc(dev, sizeof(struct gpio_fan_data),
GFP_KERNEL); GFP_KERNEL);
if (!fan_data) if (!fan_data)
return -ENOMEM; return -ENOMEM;
#ifdef CONFIG_OF_GPIO pdata = devm_kzalloc(dev,
if (!pdata) { sizeof(struct gpio_fan_platform_data),
pdata = devm_kzalloc(dev, GFP_KERNEL);
sizeof(struct gpio_fan_platform_data),
GFP_KERNEL);
if (!pdata)
return -ENOMEM;
err = gpio_fan_get_of_pdata(dev, pdata);
if (err)
return err;
}
#else /* CONFIG_OF_GPIO */
if (!pdata) if (!pdata)
return -EINVAL; return -ENOMEM;
#endif /* CONFIG_OF_GPIO */
err = gpio_fan_get_of_pdata(dev, pdata);
if (err)
return err;
fan_data->dev = dev; fan_data->dev = dev;
platform_set_drvdata(pdev, fan_data); platform_set_drvdata(pdev, fan_data);
@@ -615,17 +606,12 @@ static int gpio_fan_probe(struct platform_device *pdev)
gpio_fan_groups); gpio_fan_groups);
if (IS_ERR(fan_data->hwmon_dev)) if (IS_ERR(fan_data->hwmon_dev))
return PTR_ERR(fan_data->hwmon_dev); return PTR_ERR(fan_data->hwmon_dev);
#ifdef CONFIG_OF_GPIO
/* Optional cooling device register for Device tree platforms */ /* Optional cooling device register for Device tree platforms */
fan_data->cdev = thermal_of_cooling_device_register(np, fan_data->cdev = thermal_of_cooling_device_register(np,
"gpio-fan", "gpio-fan",
fan_data, fan_data,
&gpio_fan_cool_ops); &gpio_fan_cool_ops);
#else /* CONFIG_OF_GPIO */
/* Optional cooling device register for non Device tree platforms */
fan_data->cdev = thermal_cooling_device_register("gpio-fan", fan_data,
&gpio_fan_cool_ops);
#endif /* CONFIG_OF_GPIO */
dev_info(dev, "GPIO fan initialized\n"); dev_info(dev, "GPIO fan initialized\n");
@@ -686,9 +672,7 @@ static struct platform_driver gpio_fan_driver = {
.driver = { .driver = {
.name = "gpio-fan", .name = "gpio-fan",
.pm = GPIO_FAN_PM, .pm = GPIO_FAN_PM,
#ifdef CONFIG_OF_GPIO
.of_match_table = of_match_ptr(of_gpio_fan_match), .of_match_table = of_match_ptr(of_gpio_fan_match),
#endif
}, },
}; };