Merge tag 'v5.3-rc4' into next

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / fsl-imx25-tcq.c

diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c
index 1d6c8f490b4082576ccabe20d8928d7b6485c94d..b66df8ab89f22d72cb2785831e48ec1831d9299a 100644 (file)
--- a/drivers/input/touchscreen/fsl-imx25-tcq.c
+++ b/drivers/input/touchscreen/fsl-imx25-tcq.c
@@ -503,7 +503,6 @@ static int mx25_tcq_probe(struct platform_device *pdev)
        struct input_dev *idev;
        struct mx25_tcq_priv *priv;
        struct mx25_tsadc *tsadc = dev_get_drvdata(dev->parent);
-       struct resource *res;
        void __iomem *mem;
        int error;
 
@@ -512,8 +511,7 @@ static int mx25_tcq_probe(struct platform_device *pdev)
                return -ENOMEM;
        priv->dev = dev;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       mem = devm_ioremap_resource(dev, res);
+       mem = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(mem))
                return PTR_ERR(mem);