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

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

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 913d38f29b7306f3e9cee0f722e5b3bf7524eaf9..5e3f31b55eb7abdbd668eae444fd4c8ca8c988c8 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -1705,12 +1705,10 @@ static int pinmux_xway_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match;
        const struct pinctrl_xway_soc *xway_soc;
-       struct resource *res;
        int ret, i;
 
        /* get and remap our register range */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       xway_info.membase[0] = devm_ioremap_resource(&pdev->dev, res);
+       xway_info.membase[0] = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(xway_info.membase[0]))
                return PTR_ERR(xway_info.membase[0]);