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

Merge tag 'exynos-drm-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

One cleanup
- Use devm_platform_ioremap_resource() helper function instead of old
one.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210928074158.2942-1-inki.dae@samsung.com

+9 -31
+1 -3
drivers/gpu/drm/exynos/exynos5433_drm_decon.c
··· 793 793 { 794 794 struct device *dev = &pdev->dev; 795 795 struct decon_context *ctx; 796 - struct resource *res; 797 796 int ret; 798 797 int i; 799 798 ··· 817 818 ctx->clks[i] = clk; 818 819 } 819 820 820 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 821 - ctx->addr = devm_ioremap_resource(dev, res); 821 + ctx->addr = devm_platform_ioremap_resource(pdev, 0); 822 822 if (IS_ERR(ctx->addr)) 823 823 return PTR_ERR(ctx->addr); 824 824
+1 -3
drivers/gpu/drm/exynos/exynos_drm_dsi.c
··· 1738 1738 static int exynos_dsi_probe(struct platform_device *pdev) 1739 1739 { 1740 1740 struct device *dev = &pdev->dev; 1741 - struct resource *res; 1742 1741 struct exynos_dsi *dsi; 1743 1742 int ret, i; 1744 1743 ··· 1788 1789 } 1789 1790 } 1790 1791 1791 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1792 - dsi->reg_base = devm_ioremap_resource(dev, res); 1792 + dsi->reg_base = devm_platform_ioremap_resource(pdev, 0); 1793 1793 if (IS_ERR(dsi->reg_base)) 1794 1794 return PTR_ERR(dsi->reg_base); 1795 1795
+1 -4
drivers/gpu/drm/exynos/exynos_drm_fimc.c
··· 85 85 /* 86 86 * A structure of fimc context. 87 87 * 88 - * @regs_res: register resources. 89 88 * @regs: memory mapped io registers. 90 89 * @lock: locking of operations. 91 90 * @clocks: fimc clocks. ··· 102 103 struct exynos_drm_ipp_formats *formats; 103 104 unsigned int num_formats; 104 105 105 - struct resource *regs_res; 106 106 void __iomem *regs; 107 107 spinlock_t lock; 108 108 struct clk *clocks[FIMC_CLKS_MAX]; ··· 1325 1327 ctx->num_formats = num_formats; 1326 1328 1327 1329 /* resource memory */ 1328 - ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1329 - ctx->regs = devm_ioremap_resource(dev, ctx->regs_res); 1330 + ctx->regs = devm_platform_ioremap_resource(pdev, 0); 1330 1331 if (IS_ERR(ctx->regs)) 1331 1332 return PTR_ERR(ctx->regs); 1332 1333
+1 -3
drivers/gpu/drm/exynos/exynos_drm_fimd.c
··· 1202 1202 return PTR_ERR(ctx->lcd_clk); 1203 1203 } 1204 1204 1205 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1206 - 1207 - ctx->regs = devm_ioremap_resource(dev, res); 1205 + ctx->regs = devm_platform_ioremap_resource(pdev, 0); 1208 1206 if (IS_ERR(ctx->regs)) 1209 1207 return PTR_ERR(ctx->regs); 1210 1208
+1 -4
drivers/gpu/drm/exynos/exynos_drm_g2d.c
··· 1449 1449 static int g2d_probe(struct platform_device *pdev) 1450 1450 { 1451 1451 struct device *dev = &pdev->dev; 1452 - struct resource *res; 1453 1452 struct g2d_data *g2d; 1454 1453 int ret; 1455 1454 ··· 1490 1491 clear_bit(G2D_BIT_SUSPEND_RUNQUEUE, &g2d->flags); 1491 1492 clear_bit(G2D_BIT_ENGINE_BUSY, &g2d->flags); 1492 1493 1493 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1494 - 1495 - g2d->regs = devm_ioremap_resource(dev, res); 1494 + g2d->regs = devm_platform_ioremap_resource(pdev, 0); 1496 1495 if (IS_ERR(g2d->regs)) { 1497 1496 ret = PTR_ERR(g2d->regs); 1498 1497 goto err_put_clk;
+1 -5
drivers/gpu/drm/exynos/exynos_drm_gsc.c
··· 86 86 /* 87 87 * A structure of gsc context. 88 88 * 89 - * @regs_res: register resources. 90 89 * @regs: memory mapped io registers. 91 90 * @gsc_clk: gsc gate clock. 92 91 * @sc: scaler infomations. ··· 102 103 struct exynos_drm_ipp_formats *formats; 103 104 unsigned int num_formats; 104 105 105 - struct resource *regs_res; 106 106 void __iomem *regs; 107 107 const char **clk_names; 108 108 struct clk *clocks[GSC_MAX_CLOCKS]; ··· 1270 1272 } 1271 1273 } 1272 1274 1273 - /* resource memory */ 1274 - ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1275 - ctx->regs = devm_ioremap_resource(dev, ctx->regs_res); 1275 + ctx->regs = devm_platform_ioremap_resource(pdev, 0); 1276 1276 if (IS_ERR(ctx->regs)) 1277 1277 return PTR_ERR(ctx->regs); 1278 1278
+1 -3
drivers/gpu/drm/exynos/exynos_drm_rotator.c
··· 278 278 static int rotator_probe(struct platform_device *pdev) 279 279 { 280 280 struct device *dev = &pdev->dev; 281 - struct resource *regs_res; 282 281 struct rot_context *rot; 283 282 const struct rot_variant *variant; 284 283 int irq; ··· 291 292 rot->formats = variant->formats; 292 293 rot->num_formats = variant->num_formats; 293 294 rot->dev = dev; 294 - regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 295 - rot->regs = devm_ioremap_resource(dev, regs_res); 295 + rot->regs = devm_platform_ioremap_resource(pdev, 0); 296 296 if (IS_ERR(rot->regs)) 297 297 return PTR_ERR(rot->regs); 298 298
+1 -3
drivers/gpu/drm/exynos/exynos_drm_scaler.c
··· 485 485 static int scaler_probe(struct platform_device *pdev) 486 486 { 487 487 struct device *dev = &pdev->dev; 488 - struct resource *regs_res; 489 488 struct scaler_context *scaler; 490 489 int irq; 491 490 int ret, i; ··· 497 498 (struct scaler_data *)of_device_get_match_data(dev); 498 499 499 500 scaler->dev = dev; 500 - regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 501 - scaler->regs = devm_ioremap_resource(dev, regs_res); 501 + scaler->regs = devm_platform_ioremap_resource(pdev, 0); 502 502 if (IS_ERR(scaler->regs)) 503 503 return PTR_ERR(scaler->regs); 504 504
+1 -3
drivers/gpu/drm/exynos/exynos_hdmi.c
··· 1957 1957 struct hdmi_audio_infoframe *audio_infoframe; 1958 1958 struct device *dev = &pdev->dev; 1959 1959 struct hdmi_context *hdata; 1960 - struct resource *res; 1961 1960 int ret; 1962 1961 1963 1962 hdata = devm_kzalloc(dev, sizeof(struct hdmi_context), GFP_KERNEL); ··· 1978 1979 return ret; 1979 1980 } 1980 1981 1981 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1982 - hdata->regs = devm_ioremap_resource(dev, res); 1982 + hdata->regs = devm_platform_ioremap_resource(pdev, 0); 1983 1983 if (IS_ERR(hdata->regs)) { 1984 1984 ret = PTR_ERR(hdata->regs); 1985 1985 return ret;