Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / drivers / pinctrl / pinctrl-bm1880.c

diff --git a/drivers/pinctrl/pinctrl-bm1880.c b/drivers/pinctrl/pinctrl-bm1880.c
index 63b130cb1ffb016ce1688e7bf50541bca0e2d7d4..f7dff4f141017d87366763dc452799e1d4030e2e 100644 (file)
--- a/drivers/pinctrl/pinctrl-bm1880.c
+++ b/drivers/pinctrl/pinctrl-bm1880.c
@@ -1308,15 +1308,13 @@ static struct pinctrl_desc bm1880_desc = {
 static int bm1880_pinctrl_probe(struct platform_device *pdev)
 
 {
-       struct resource *res;
        struct bm1880_pinctrl *pctrl;
 
        pctrl = devm_kzalloc(&pdev->dev, sizeof(*pctrl), GFP_KERNEL);
        if (!pctrl)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       pctrl->base = devm_ioremap_resource(&pdev->dev, res);
+       pctrl->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pctrl->base))
                return PTR_ERR(pctrl->base);