diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 11:09:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 12:21:47 -0800 |
| commit | e2cbdf3cb72571f1231cd7c3cb14009f9b8df707 (patch) | |
| tree | 79cab96de9801117a1bbe723646b5408d0ea20fc /drivers/power | |
| parent | b0de774c6334dccdcd43a7ef46155a1f3a52a954 (diff) | |
| download | linux-3.10-e2cbdf3cb72571f1231cd7c3cb14009f9b8df707.tar.gz linux-3.10-e2cbdf3cb72571f1231cd7c3cb14009f9b8df707.tar.bz2 linux-3.10-e2cbdf3cb72571f1231cd7c3cb14009f9b8df707.zip | |
power: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/jz4740-battery.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c index bf914893c6f..c675553d464 100644 --- a/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c @@ -22,6 +22,7 @@ #include <linux/io.h> #include <linux/delay.h> +#include <linux/err.h> #include <linux/gpio.h> #include <linux/mfd/core.h> #include <linux/power_supply.h> @@ -266,9 +267,9 @@ static int jz_battery_probe(struct platform_device *pdev) mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - jz_battery->base = devm_request_and_ioremap(&pdev->dev, mem); - if (!jz_battery->base) - return -EBUSY; + jz_battery->base = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(jz_battery->base)) + return PTR_ERR(jz_battery->base); battery = &jz_battery->battery; battery->name = pdata->info.name; |