Commit 78ea8141 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'exynos-drm-fixes-for-v5.15-rc4' of... 

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: default avatarDaniel 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
parents 3ff43f9d 17ac76e0

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −3
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct decon_context *ctx;

	struct resource *res;

	int ret;

	int i;
@@ -818,8 +817,7 @@ static int exynos5433_decon_probe(struct platform_device *pdev) 
		ctx->clks[i] = clk;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->addr = devm_ioremap_resource(dev, res);

	ctx->addr = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ctx->addr))

		return PTR_ERR(ctx->addr);

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+1 −3
Original line number Diff line number Diff line
@@ -1738,7 +1738,6 @@ static const struct component_ops exynos_dsi_component_ops = { 
static int exynos_dsi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct resource *res;

	struct exynos_dsi *dsi;

	int ret, i;
@@ -1789,8 +1788,7 @@ static int exynos_dsi_probe(struct platform_device *pdev) 
		}

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dsi->reg_base = devm_ioremap_resource(dev, res);

	dsi->reg_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dsi->reg_base))

		return PTR_ERR(dsi->reg_base);

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+1 −4
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ struct fimc_scaler { 
/*

 * A structure of fimc context.

 *

 * @regs_res: register resources.

 * @regs: memory mapped io registers.

 * @lock: locking of operations.

 * @clocks: fimc clocks.
@@ -103,7 +102,6 @@ struct fimc_context { 
	struct exynos_drm_ipp_formats	*formats;

	unsigned int			num_formats;



	struct resource	*regs_res;

	void __iomem	*regs;

	spinlock_t	lock;

	struct clk	*clocks[FIMC_CLKS_MAX];
@@ -1327,8 +1325,7 @@ static int fimc_probe(struct platform_device *pdev) 
	ctx->num_formats = num_formats;



	/* resource memory */

	ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);

	ctx->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −3
Original line number Diff line number Diff line
@@ -1202,9 +1202,7 @@ static int fimd_probe(struct platform_device *pdev) 
		return PTR_ERR(ctx->lcd_clk);

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	ctx->regs = devm_ioremap_resource(dev, res);

	ctx->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+1 −4
Original line number Diff line number Diff line
@@ -1449,7 +1449,6 @@ static const struct component_ops g2d_component_ops = { 
static int g2d_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct resource *res;

	struct g2d_data *g2d;

	int ret;
@@ -1491,9 +1490,7 @@ static int g2d_probe(struct platform_device *pdev) 
	clear_bit(G2D_BIT_SUSPEND_RUNQUEUE, &g2d->flags);

	clear_bit(G2D_BIT_ENGINE_BUSY, &g2d->flags);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	g2d->regs = devm_ioremap_resource(dev, res);

	g2d->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(g2d->regs)) {

		ret = PTR_ERR(g2d->regs);

		goto err_put_clk;