May 12 2013

drivers: pinctrl: vt8500: use devm_ioremap_resource() 

Author: Laurent Navet <laurent.navet@gmail.com>

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.

Found with coccicheck and this semantic patch:
 scripts/coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Laurent Navet 
Acked-by: Tony Prisk 
Signed-off-by: Linus Walleij 

---
 drivers/pinctrl/vt8500/pinctrl-wmt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 
diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 70d986e..fb30edf3 100644
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -569,10 +569,10 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
 	struct resource *res;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	data->base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!data->base) {
+	data->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(data->base)) {
 		dev_err(&pdev->dev, "failed to map memory resource\n");
-		return -EBUSY;
+		return PTR_ERR(data->base);
 	}
 
 	wmt_desc.pins = data->pins;

qlambert