Skip to content

Commit 7544f3e

Browse files
committed
Merge tag 'exynos-drm-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
Fixup - Correct kerneldoc of fimd_shadow_protect_win function. Cleanup - Drop redundant error messages. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Inki Dae <inki.dae@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210520034747.257687-1-inki.dae@samsung.com
2 parents d07f6ca + a470c56 commit 7544f3e

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,8 @@ static int exynos5433_decon_probe(struct platform_device *pdev)
815815

816816
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
817817
ctx->addr = devm_ioremap_resource(dev, res);
818-
if (IS_ERR(ctx->addr)) {
819-
dev_err(dev, "ioremap failed\n");
818+
if (IS_ERR(ctx->addr))
820819
return PTR_ERR(ctx->addr);
821-
}
822820

823821
ret = decon_conf_irq(ctx, "vsync", decon_irq_handler, 0);
824822
if (ret < 0)

drivers/gpu/drm/exynos/exynos_drm_dsi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,10 +1786,8 @@ static int exynos_dsi_probe(struct platform_device *pdev)
17861786

17871787
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
17881788
dsi->reg_base = devm_ioremap_resource(dev, res);
1789-
if (IS_ERR(dsi->reg_base)) {
1790-
dev_err(dev, "failed to remap io region\n");
1789+
if (IS_ERR(dsi->reg_base))
17911790
return PTR_ERR(dsi->reg_base);
1792-
}
17931791

17941792
dsi->phy = devm_phy_get(dev, "dsim");
17951793
if (IS_ERR(dsi->phy)) {

drivers/gpu/drm/exynos/exynos_drm_fimd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ static void fimd_win_set_colkey(struct fimd_context *ctx, unsigned int win)
723723
}
724724

725725
/**
726-
* shadow_protect_win() - disable updating values from shadow registers at vsync
726+
* fimd_shadow_protect_win() - disable updating values from shadow registers at vsync
727727
*
728728
* @ctx: local driver data
729729
* @win: window to protect registers for

0 commit comments

Comments
 (0)