diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 18:57:56 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 06:08:29 +0200 |
| commit | d8f30ad8e556cad5ee23fdb63845914aec4a8172 (patch) | |
| tree | 1bc22399e252290be637f3cdd9c2542f3f2b4141 /drivers/hwmon/abituguru.c | |
| parent | hwmon: (sch56xx-common) Fix build warnings (diff) | |
| download | linux-d8f30ad8e556cad5ee23fdb63845914aec4a8172.tar.xz linux-d8f30ad8e556cad5ee23fdb63845914aec4a8172.zip | |
hwmon: (abituguru) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code.
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/abituguru.c')
| -rw-r--r-- | drivers/hwmon/abituguru.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c index d4419b47f3d4..78b81793ddd9 100644 --- a/drivers/hwmon/abituguru.c +++ b/drivers/hwmon/abituguru.c @@ -1278,7 +1278,8 @@ static int __devinit abituguru_probe(struct platform_device *pdev) 0x00, 0x01, 0x03, 0x04, 0x0A, 0x08, 0x0E, 0x02, 0x09, 0x06, 0x05, 0x0B, 0x0F, 0x0D, 0x07, 0x0C }; - data = kzalloc(sizeof(struct abituguru_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct abituguru_data), + GFP_KERNEL); if (!data) return -ENOMEM; @@ -1430,8 +1431,6 @@ abituguru_probe_error: for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) device_remove_file(&pdev->dev, &abituguru_sysfs_attr[i].dev_attr); - platform_set_drvdata(pdev, NULL); - kfree(data); return res; } @@ -1446,8 +1445,6 @@ static int __devexit abituguru_remove(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) device_remove_file(&pdev->dev, &abituguru_sysfs_attr[i].dev_attr); - platform_set_drvdata(pdev, NULL); - kfree(data); return 0; } |