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

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

diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c
index 348423bb39dda4c034dc5ba537073b4768a1e39d..cc306448259eca81cf350c8c8602c076b5eba284 100644 (file)
--- a/drivers/pinctrl/pinctrl-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c
@@ -1055,7 +1055,6 @@ static struct pinctrl_desc u300_pmx_desc = {
 static int u300_pmx_probe(struct platform_device *pdev)
 {
        struct u300_pmx *upmx;
-       struct resource *res;
 
        /* Create state holders etc for this driver */
        upmx = devm_kzalloc(&pdev->dev, sizeof(*upmx), GFP_KERNEL);
@@ -1064,8 +1063,7 @@ static int u300_pmx_probe(struct platform_device *pdev)
 
        upmx->dev = &pdev->dev;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       upmx->virtbase = devm_ioremap_resource(&pdev->dev, res);
+       upmx->virtbase = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(upmx->virtbase))
                return PTR_ERR(upmx->virtbase);