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>
This commit is contained in:
parent
b0de774c63
commit
e2cbdf3cb7
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue