dm: convert to idr_alloc()

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-u300.c

diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c
index 718ec576268332ec76a5ab30a75e2865e53ed403..2b5772550836095fbb250a6c3a76e9ae9fdce610 100644 (file)
--- a/drivers/pinctrl/pinctrl-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c
@@ -1078,9 +1078,9 @@ static int u300_pmx_probe(struct platform_device *pdev)
        if (!res)
                return -ENOENT;
 
-       upmx->virtbase = devm_request_and_ioremap(&pdev->dev, res);
-       if (!upmx->virtbase)
-               return -ENOMEM;
+       upmx->virtbase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(upmx->virtbase))
+               return PTR_ERR(upmx->virtbase);
 
        upmx->pctl = pinctrl_register(&u300_pmx_desc, &pdev->dev, upmx);
        if (!upmx->pctl) {