tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/sun4i: Make use of the helper function devm_platform_ioremap_resource()

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831135740.4826-1-caihuoqing@baidu.com

authored by

Cai Huoqing and committed by
Maxime Ripard f5df171f 23019ff2

+8 -24
+1 -3
drivers/gpu/drm/sun4i/sun4i_backend.c
··· 782 782 struct sun4i_drv *drv = drm->dev_private; 783 783 struct sun4i_backend *backend; 784 784 const struct sun4i_backend_quirks *quirks; 785 - struct resource *res; 786 785 void __iomem *regs; 787 786 int i, ret; 788 787 ··· 814 815 if (IS_ERR(backend->frontend)) 815 816 dev_warn(dev, "Couldn't find matching frontend, frontend features disabled\n"); 816 817 817 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 818 - regs = devm_ioremap_resource(dev, res); 818 + regs = devm_platform_ioremap_resource(pdev, 0); 819 819 if (IS_ERR(regs)) 820 820 return PTR_ERR(regs); 821 821
+1 -3
drivers/gpu/drm/sun4i/sun4i_frontend.c
··· 561 561 struct sun4i_frontend *frontend; 562 562 struct drm_device *drm = data; 563 563 struct sun4i_drv *drv = drm->dev_private; 564 - struct resource *res; 565 564 void __iomem *regs; 566 565 567 566 frontend = devm_kzalloc(dev, sizeof(*frontend), GFP_KERNEL); ··· 575 576 if (!frontend->data) 576 577 return -ENODEV; 577 578 578 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 579 - regs = devm_ioremap_resource(dev, res); 579 + regs = devm_platform_ioremap_resource(pdev, 0); 580 580 if (IS_ERR(regs)) 581 581 return PTR_ERR(regs); 582 582
+1 -3
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
··· 489 489 struct cec_connector_info conn_info; 490 490 struct sun4i_drv *drv = drm->dev_private; 491 491 struct sun4i_hdmi *hdmi; 492 - struct resource *res; 493 492 u32 reg; 494 493 int ret; 495 494 ··· 503 504 if (!hdmi->variant) 504 505 return -EINVAL; 505 506 506 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 507 - hdmi->base = devm_ioremap_resource(dev, res); 507 + hdmi->base = devm_platform_ioremap_resource(pdev, 0); 508 508 if (IS_ERR(hdmi->base)) { 509 509 dev_err(dev, "Couldn't map the HDMI encoder registers\n"); 510 510 return PTR_ERR(hdmi->base);
+1 -3
drivers/gpu/drm/sun4i/sun4i_tcon.c
··· 841 841 struct sun4i_tcon *tcon) 842 842 { 843 843 struct platform_device *pdev = to_platform_device(dev); 844 - struct resource *res; 845 844 void __iomem *regs; 846 845 847 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 848 - regs = devm_ioremap_resource(dev, res); 846 + regs = devm_platform_ioremap_resource(pdev, 0); 849 847 if (IS_ERR(regs)) 850 848 return PTR_ERR(regs); 851 849
+1 -3
drivers/gpu/drm/sun4i/sun4i_tv.c
··· 538 538 struct drm_device *drm = data; 539 539 struct sun4i_drv *drv = drm->dev_private; 540 540 struct sun4i_tv *tv; 541 - struct resource *res; 542 541 void __iomem *regs; 543 542 int ret; 544 543 ··· 547 548 tv->drv = drv; 548 549 dev_set_drvdata(dev, tv); 549 550 550 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 551 - regs = devm_ioremap_resource(dev, res); 551 + regs = devm_platform_ioremap_resource(pdev, 0); 552 552 if (IS_ERR(regs)) { 553 553 dev_err(dev, "Couldn't map the TV encoder registers\n"); 554 554 return PTR_ERR(regs);
+1 -3
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
··· 1104 1104 struct device *dev = &pdev->dev; 1105 1105 const char *bus_clk_name = NULL; 1106 1106 struct sun6i_dsi *dsi; 1107 - struct resource *res; 1108 1107 void __iomem *base; 1109 1108 int ret; 1110 1109 ··· 1119 1120 "allwinner,sun6i-a31-mipi-dsi")) 1120 1121 bus_clk_name = "bus"; 1121 1122 1122 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1123 - base = devm_ioremap_resource(dev, res); 1123 + base = devm_platform_ioremap_resource(pdev, 0); 1124 1124 if (IS_ERR(base)) { 1125 1125 dev_err(dev, "Couldn't map the DSI encoder registers\n"); 1126 1126 return PTR_ERR(base);
+1 -3
drivers/gpu/drm/sun4i/sun8i_mixer.c
··· 337 337 struct drm_device *drm = data; 338 338 struct sun4i_drv *drv = drm->dev_private; 339 339 struct sun8i_mixer *mixer; 340 - struct resource *res; 341 340 void __iomem *regs; 342 341 unsigned int base; 343 342 int plane_cnt; ··· 389 390 if (!mixer->cfg) 390 391 return -EINVAL; 391 392 392 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 393 - regs = devm_ioremap_resource(dev, res); 393 + regs = devm_platform_ioremap_resource(pdev, 0); 394 394 if (IS_ERR(regs)) 395 395 return PTR_ERR(regs); 396 396
+1 -3
drivers/gpu/drm/sun4i/sun8i_tcon_top.c
··· 128 128 struct clk_hw_onecell_data *clk_data; 129 129 struct sun8i_tcon_top *tcon_top; 130 130 const struct sun8i_tcon_top_quirks *quirks; 131 - struct resource *res; 132 131 void __iomem *regs; 133 132 int ret, i; 134 133 ··· 157 158 return PTR_ERR(tcon_top->bus); 158 159 } 159 160 160 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 161 - regs = devm_ioremap_resource(dev, res); 161 + regs = devm_platform_ioremap_resource(pdev, 0); 162 162 tcon_top->regs = regs; 163 163 if (IS_ERR(regs)) 164 164 return PTR_ERR(regs);