summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Navet <laurent.navet@gmail.com>2013-05-12 16:59:51 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-06-16 11:56:49 +0200
commit76cda6ec39d30a9d40ae2a82a6015381438a87eb (patch)
tree7dc5332623c10b1116b87920cfa0d8eb01673e5d
parentbbd7b275dbc24cc712b6bbc0f5211e9a9791dd89 (diff)
drivers: pinctrl: vt8500: use devm_ioremap_resource()
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 <laurent.navet@gmail.com> Acked-by: Tony Prisk <linux@prisktech.co.nz> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/vt8500/pinctrl-wmt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 70d986e04afb..fb30edf31f98 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;