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

hwmon: (jz4740-hwmon) Convert to use devm_ functions

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

Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-06-02 12:22:08 -07:00
parent 816864d996
commit b25df2bfbe
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/hwmon/jz4740-hwmon.c
View File

@ -20,6 +20,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
@ -106,42 +107,37 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
int ret; int ret;
struct jz4740_hwmon *hwmon; struct jz4740_hwmon *hwmon;
hwmon = kmalloc(sizeof(*hwmon), GFP_KERNEL); hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL);
if (!hwmon) { if (!hwmon)
dev_err(&pdev->dev, "Failed to allocate driver structure\n");
return -ENOMEM; return -ENOMEM;
}
hwmon->cell = mfd_get_cell(pdev); hwmon->cell = mfd_get_cell(pdev);
hwmon->irq = platform_get_irq(pdev, 0); hwmon->irq = platform_get_irq(pdev, 0);
if (hwmon->irq < 0) { if (hwmon->irq < 0) {
ret = hwmon->irq; dev_err(&pdev->dev, "Failed to get platform irq: %d\n",
dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret); hwmon->irq);
goto err_free; return hwmon->irq;
} }
hwmon->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); hwmon->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!hwmon->mem) { if (!hwmon->mem) {
ret = -ENOENT;
dev_err(&pdev->dev, "Failed to get platform mmio resource\n"); dev_err(&pdev->dev, "Failed to get platform mmio resource\n");
goto err_free; return -ENOENT;
} }
hwmon->mem = request_mem_region(hwmon->mem->start, hwmon->mem = devm_request_mem_region(&pdev->dev, hwmon->mem->start,
resource_size(hwmon->mem), pdev->name); resource_size(hwmon->mem), pdev->name);
if (!hwmon->mem) { if (!hwmon->mem) {
ret = -EBUSY;
dev_err(&pdev->dev, "Failed to request mmio memory region\n"); dev_err(&pdev->dev, "Failed to request mmio memory region\n");
goto err_free; return -EBUSY;
} }
hwmon->base = ioremap_nocache(hwmon->mem->start, hwmon->base = devm_ioremap_nocache(&pdev->dev, hwmon->mem->start,
resource_size(hwmon->mem)); resource_size(hwmon->mem));
if (!hwmon->base) { if (!hwmon->base) {
ret = -EBUSY;
dev_err(&pdev->dev, "Failed to ioremap mmio memory\n"); dev_err(&pdev->dev, "Failed to ioremap mmio memory\n");
goto err_release_mem_region; return -EBUSY;
} }
init_completion(&hwmon->read_completion); init_completion(&hwmon->read_completion);
@ -149,17 +145,18 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, hwmon); platform_set_drvdata(pdev, hwmon);
ret = request_irq(hwmon->irq, jz4740_hwmon_irq, 0, pdev->name, hwmon); ret = devm_request_irq(&pdev->dev, hwmon->irq, jz4740_hwmon_irq, 0,
pdev->name, hwmon);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", ret); dev_err(&pdev->dev, "Failed to request irq: %d\n", ret);
goto err_iounmap; return ret;
} }
disable_irq(hwmon->irq); disable_irq(hwmon->irq);
ret = sysfs_create_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group); ret = sysfs_create_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to create sysfs group: %d\n", ret); dev_err(&pdev->dev, "Failed to create sysfs group: %d\n", ret);
goto err_free_irq; return ret;
} }
hwmon->hwmon = hwmon_device_register(&pdev->dev); hwmon->hwmon = hwmon_device_register(&pdev->dev);
@ -172,16 +169,6 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
err_remove_file: err_remove_file:
sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group); sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
err_free_irq:
free_irq(hwmon->irq, hwmon);
err_iounmap:
platform_set_drvdata(pdev, NULL);
iounmap(hwmon->base);
err_release_mem_region:
release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
err_free:
kfree(hwmon);
return ret; return ret;
} }
@ -192,14 +179,6 @@ static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)
hwmon_device_unregister(hwmon->hwmon); hwmon_device_unregister(hwmon->hwmon);
sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group); sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
free_irq(hwmon->irq, hwmon);
iounmap(hwmon->base);
release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
platform_set_drvdata(pdev, NULL);
kfree(hwmon);
return 0; return 0;
} }