evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hwmon: (ads7871) Convert to use devm_ functions

Browse source 
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-06-02 09:58:00 -07:00
parent 34e3f7f5a2
commit 33fd2b84c9
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/hwmon/ads7871.c
View file

@ -198,20 +198,17 @@ static int __devinit ads7871_probe(struct spi_device *spi)
* because there is no other error checking on an SPI bus * because there is no other error checking on an SPI bus
* we need to make sure we really have a chip * we need to make sure we really have a chip
*/ */
if (val != ret) { if (val != ret)
err = -ENODEV; return -ENODEV;
goto exit;
}
pdata = kzalloc(sizeof(struct ads7871_data), GFP_KERNEL); pdata = devm_kzalloc(&spi->dev, sizeof(struct ads7871_data),
if (!pdata) { GFP_KERNEL);
err = -ENOMEM; if (!pdata)
goto exit; return -ENOMEM;
}
err = sysfs_create_group(&spi->dev.kobj, &ads7871_group); err = sysfs_create_group(&spi->dev.kobj, &ads7871_group);
if (err < 0) if (err < 0)
goto error_free; return err;
spi_set_drvdata(spi, pdata); spi_set_drvdata(spi, pdata);
@ -225,9 +222,6 @@ static int __devinit ads7871_probe(struct spi_device *spi)
error_remove: error_remove:
sysfs_remove_group(&spi->dev.kobj, &ads7871_group); sysfs_remove_group(&spi->dev.kobj, &ads7871_group);
error_free:
kfree(pdata);
exit:
return err; return err;
} }
@ -237,7 +231,6 @@ static int __devexit ads7871_remove(struct spi_device *spi)
hwmon_device_unregister(pdata->hwmon_dev); hwmon_device_unregister(pdata->hwmon_dev);
sysfs_remove_group(&spi->dev.kobj, &ads7871_group); sysfs_remove_group(&spi->dev.kobj, &ads7871_group);
kfree(pdata);
return 0; return 0;
} }