Merge tag 'v5.3-rc4' into next

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / sun4i-ts.c

diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c
index f11ba7f2dca76aaa218b27dff7b2f5823c4db223..0af0fe8c40d7f19dae9c52e7e6dc1a20845f4ffe 100644 (file)
--- a/drivers/input/touchscreen/sun4i-ts.c
+++ b/drivers/input/touchscreen/sun4i-ts.c
@@ -300,8 +300,7 @@ static int sun4i_ts_probe(struct platform_device *pdev)
                input_set_drvdata(ts->input, ts);
        }
 
-       ts->base = devm_ioremap_resource(dev,
-                             platform_get_resource(pdev, IORESOURCE_MEM, 0));
+       ts->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ts->base))
                return PTR_ERR(ts->base);