@@ -1376,7 +1376,7 @@ static int rcar_drif_probe(struct platform_device *pdev)
struct rcar_drif_sdr *sdr;
struct device_node *np;
struct rcar_drif *ch;
- struct resource *res;
+ struct resource *res;
int ret;
/* Reserve memory for enabled channel */
@@ -1395,8 +1395,7 @@ static int rcar_drif_probe(struct platform_device *pdev)
}
/* Register map */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- ch->base = devm_ioremap_resource(&pdev->dev, res);
+ ch->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(ch->base))
return PTR_ERR(ch->base);
Use the devm_platform_get_and_ioremap_resource() helper instead of calling platform_get_resource() and devm_ioremap_resource() separately. Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> --- v1->v2: Use devm_platform_get_and_ioremap_resource() instead of devm_platform_ioremap_resource(). v2->v3: Update commit message. drivers/media/platform/rcar_drif.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)