can: esd_usb2: fix memory leak on disconnect

[karo-tx-linux.git] / drivers / hwmon / gpio-fan.c

diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 2566c43dd1e963ec0d43f4ccefc49ca16506a77b..4efa1734bdad8d60de7f359dd4e885fc44181c24 100644 (file)
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -173,7 +173,7 @@ static int get_fan_speed_index(struct gpio_fan_data *fan_data)
        return -ENODEV;
 }
 
-static int rpm_to_speed_index(struct gpio_fan_data *fan_data, int rpm)
+static int rpm_to_speed_index(struct gpio_fan_data *fan_data, unsigned long rpm)
 {
        struct gpio_fan_speed *speed = fan_data->speed;
        int i;
@@ -537,9 +537,10 @@ static int gpio_fan_probe(struct platform_device *pdev)
        }
 
        /* Make this driver part of hwmon class. */
-       fan_data->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
-                                               "gpio_fan", fan_data,
-                                               gpio_fan_groups);
+       fan_data->hwmon_dev =
+               devm_hwmon_device_register_with_groups(&pdev->dev,
+                                                      "gpio_fan", fan_data,
+                                                      gpio_fan_groups);
        if (IS_ERR(fan_data->hwmon_dev))
                return PTR_ERR(fan_data->hwmon_dev);
 
@@ -548,15 +549,6 @@ static int gpio_fan_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int gpio_fan_remove(struct platform_device *pdev)
-{
-       struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);
-
-       hwmon_device_unregister(fan_data->hwmon_dev);
-
-       return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int gpio_fan_suspend(struct device *dev)
 {
@@ -588,7 +580,6 @@ static SIMPLE_DEV_PM_OPS(gpio_fan_pm, gpio_fan_suspend, gpio_fan_resume);
 
 static struct platform_driver gpio_fan_driver = {
        .probe          = gpio_fan_probe,
-       .remove         = gpio_fan_remove,
        .driver = {
                .name   = "gpio-fan",
                .pm     = GPIO_FAN_PM,