]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (f71882fg) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:05 +0000 (09:58 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 15 Sep 2012 14:57:22 +0000 (07:57 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/f71882fg.c

index dd5ae567bf92a51501d3d833bd2ccccedc7502c9..50e4ce2d22d8b2bd0f5134581ac0dd35ea47a2a1 100644 (file)
@@ -2274,7 +2274,8 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
        int err, i;
        u8 start_reg, reg;
 
-       data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL);
+       data = devm_kzalloc(&pdev->dev, sizeof(struct f71882fg_data),
+                           GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -2288,13 +2289,11 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
        start_reg = f71882fg_read8(data, F71882FG_REG_START);
        if (start_reg & 0x04) {
                dev_warn(&pdev->dev, "Hardware monitor is powered down\n");
-               err = -ENODEV;
-               goto exit_free;
+               return -ENODEV;
        }
        if (!(start_reg & 0x03)) {
                dev_warn(&pdev->dev, "Hardware monitoring not activated\n");
-               err = -ENODEV;
-               goto exit_free;
+               return -ENODEV;
        }
 
        /* Register sysfs interface files */
@@ -2422,8 +2421,6 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
 exit_unregister_sysfs:
        f71882fg_remove(pdev); /* Will unregister the sysfs files for us */
        return err; /* f71882fg_remove() also frees our data */
-exit_free:
-       kfree(data);
        return err;
 }
 
@@ -2525,10 +2522,6 @@ static int f71882fg_remove(struct platform_device *pdev)
                                ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
                }
        }
-
-       platform_set_drvdata(pdev, NULL);
-       kfree(data);
-
        return 0;
 }