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

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

diff --git a/drivers/pinctrl/pinctrl-artpec6.c b/drivers/pinctrl/pinctrl-artpec6.c
index e3239cf926f99717257ac9da2400a5880c38de1e..986e04ac6b5bb071d21689cd596dffd9dcfacbaa 100644 (file)
--- a/drivers/pinctrl/pinctrl-artpec6.c
+++ b/drivers/pinctrl/pinctrl-artpec6.c
@@ -936,7 +936,6 @@ static void artpec6_pmx_reset(struct artpec6_pmx *pmx)
 static int artpec6_pmx_probe(struct platform_device *pdev)
 {
        struct artpec6_pmx *pmx;
-       struct resource *res;
 
        pmx = devm_kzalloc(&pdev->dev, sizeof(*pmx), GFP_KERNEL);
        if (!pmx)
@@ -944,8 +943,7 @@ static int artpec6_pmx_probe(struct platform_device *pdev)
 
        pmx->dev = &pdev->dev;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       pmx->base = devm_ioremap_resource(&pdev->dev, res);
+       pmx->base = devm_platform_ioremap_resource(pdev, 0);
 
        if (IS_ERR(pmx->base))
                return PTR_ERR(pmx->base);