From 49cfabc20ac9ab6117093460a5ac418922e8e9b0 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 27 May 2014 15:29:17 +0900 Subject: pinctrl: berlin: Use devm_ioremap_resource() Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource(). Signed-off-by: Jingoo Han Acked-by: Antoine Tenart Signed-off-by: Linus Walleij --- drivers/pinctrl/berlin/berlin-bg2cd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/pinctrl/berlin/berlin-bg2cd.c') diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c index e095a5d94395..89d585ef7da7 100644 --- a/drivers/pinctrl/berlin/berlin-bg2cd.c +++ b/drivers/pinctrl/berlin/berlin-bg2cd.c @@ -186,9 +186,9 @@ static int berlin2cd_pinctrl_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_request_and_ioremap(&pdev->dev, res); - if (!base) - return -EADDRNOTAVAIL; + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); rmconfig->reg_bits = 32, rmconfig->val_bits = 32, -- cgit v1.2.3