Skip to content

Commit 78ea814

Browse files
danvetdanvet
committed
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 <[email protected]> From: Inki Dae <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 3ff43f9 + 17ac76e commit 78ea814

File tree

9 files changed

+9
-31
lines changed

9 files changed

+9
-31
lines changed

‎drivers/gpu/drm/exynos/exynos5433_drm_decon.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev)
793793
{
794794
struct device *dev = &pdev->dev;
795795
struct decon_context *ctx;
796-
struct resource *res;
797796
int ret;
798797
int i;
799798

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

821-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
822-
ctx->addr = devm_ioremap_resource(dev, res);
820+
ctx->addr = devm_platform_ioremap_resource(pdev, 0);
823821
if (IS_ERR(ctx->addr))
824822
return PTR_ERR(ctx->addr);
825823

‎drivers/gpu/drm/exynos/exynos_drm_dsi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,6 @@ static const struct component_ops exynos_dsi_component_ops = {
17381738
static int exynos_dsi_probe(struct platform_device *pdev)
17391739
{
17401740
struct device *dev = &pdev->dev;
1741-
struct resource *res;
17421741
struct exynos_dsi *dsi;
17431742
int ret, i;
17441743

@@ -1789,8 +1788,7 @@ static int exynos_dsi_probe(struct platform_device *pdev)
17891788
}
17901789
}
17911790

1792-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1793-
dsi->reg_base = devm_ioremap_resource(dev, res);
1791+
dsi->reg_base = devm_platform_ioremap_resource(pdev, 0);
17941792
if (IS_ERR(dsi->reg_base))
17951793
return PTR_ERR(dsi->reg_base);
17961794

‎drivers/gpu/drm/exynos/exynos_drm_fimc.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ struct fimc_scaler {
8585
/*
8686
* A structure of fimc context.
8787
*
88-
* @regs_res: register resources.
8988
* @regs: memory mapped io registers.
9089
* @lock: locking of operations.
9190
* @clocks: fimc clocks.
@@ -103,7 +102,6 @@ struct fimc_context {
103102
struct exynos_drm_ipp_formats *formats;
104103
unsigned int num_formats;
105104

106-
struct resource *regs_res;
107105
void __iomem *regs;
108106
spinlock_t lock;
109107
struct clk *clocks[FIMC_CLKS_MAX];
@@ -1327,8 +1325,7 @@ static int fimc_probe(struct platform_device *pdev)
13271325
ctx->num_formats = num_formats;
13281326

13291327
/* resource memory */
1330-
ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1331-
ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);
1328+
ctx->regs = devm_platform_ioremap_resource(pdev, 0);
13321329
if (IS_ERR(ctx->regs))
13331330
return PTR_ERR(ctx->regs);
13341331

‎drivers/gpu/drm/exynos/exynos_drm_fimd.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,9 +1202,7 @@ static int fimd_probe(struct platform_device *pdev)
12021202
return PTR_ERR(ctx->lcd_clk);
12031203
}
12041204

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);
12081206
if (IS_ERR(ctx->regs))
12091207
return PTR_ERR(ctx->regs);
12101208

‎drivers/gpu/drm/exynos/exynos_drm_g2d.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,6 @@ static const struct component_ops g2d_component_ops = {
14491449
static int g2d_probe(struct platform_device *pdev)
14501450
{
14511451
struct device *dev = &pdev->dev;
1452-
struct resource *res;
14531452
struct g2d_data *g2d;
14541453
int ret;
14551454

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

1494-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1495-
1496-
g2d->regs = devm_ioremap_resource(dev, res);
1493+
g2d->regs = devm_platform_ioremap_resource(pdev, 0);
14971494
if (IS_ERR(g2d->regs)) {
14981495
ret = PTR_ERR(g2d->regs);
14991496
goto err_put_clk;

‎drivers/gpu/drm/exynos/exynos_drm_gsc.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ struct gsc_scaler {
8686
/*
8787
* A structure of gsc context.
8888
*
89-
* @regs_res: register resources.
9089
* @regs: memory mapped io registers.
9190
* @gsc_clk: gsc gate clock.
9291
* @sc: scaler infomations.
@@ -103,7 +102,6 @@ struct gsc_context {
103102
struct exynos_drm_ipp_formats *formats;
104103
unsigned int num_formats;
105104

106-
struct resource *regs_res;
107105
void __iomem *regs;
108106
const char **clk_names;
109107
struct clk *clocks[GSC_MAX_CLOCKS];
@@ -1272,9 +1270,7 @@ static int gsc_probe(struct platform_device *pdev)
12721270
}
12731271
}
12741272

1275-
/* resource memory */
1276-
ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1277-
ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);
1273+
ctx->regs = devm_platform_ioremap_resource(pdev, 0);
12781274
if (IS_ERR(ctx->regs))
12791275
return PTR_ERR(ctx->regs);
12801276

‎drivers/gpu/drm/exynos/exynos_drm_rotator.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ static const struct component_ops rotator_component_ops = {
278278
static int rotator_probe(struct platform_device *pdev)
279279
{
280280
struct device *dev = &pdev->dev;
281-
struct resource *regs_res;
282281
struct rot_context *rot;
283282
const struct rot_variant *variant;
284283
int irq;
@@ -292,8 +291,7 @@ static int rotator_probe(struct platform_device *pdev)
292291
rot->formats = variant->formats;
293292
rot->num_formats = variant->num_formats;
294293
rot->dev = dev;
295-
regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
296-
rot->regs = devm_ioremap_resource(dev, regs_res);
294+
rot->regs = devm_platform_ioremap_resource(pdev, 0);
297295
if (IS_ERR(rot->regs))
298296
return PTR_ERR(rot->regs);
299297

‎drivers/gpu/drm/exynos/exynos_drm_scaler.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,6 @@ static const struct component_ops scaler_component_ops = {
485485
static int scaler_probe(struct platform_device *pdev)
486486
{
487487
struct device *dev = &pdev->dev;
488-
struct resource *regs_res;
489488
struct scaler_context *scaler;
490489
int irq;
491490
int ret, i;
@@ -498,8 +497,7 @@ static int scaler_probe(struct platform_device *pdev)
498497
(struct scaler_data *)of_device_get_match_data(dev);
499498

500499
scaler->dev = dev;
501-
regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
502-
scaler->regs = devm_ioremap_resource(dev, regs_res);
500+
scaler->regs = devm_platform_ioremap_resource(pdev, 0);
503501
if (IS_ERR(scaler->regs))
504502
return PTR_ERR(scaler->regs);
505503

‎drivers/gpu/drm/exynos/exynos_hdmi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,6 @@ static int hdmi_probe(struct platform_device *pdev)
19571957
struct hdmi_audio_infoframe *audio_infoframe;
19581958
struct device *dev = &pdev->dev;
19591959
struct hdmi_context *hdata;
1960-
struct resource *res;
19611960
int ret;
19621961

19631962
hdata = devm_kzalloc(dev, sizeof(struct hdmi_context), GFP_KERNEL);
@@ -1979,8 +1978,7 @@ static int hdmi_probe(struct platform_device *pdev)
19791978
return ret;
19801979
}
19811980

1982-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1983-
hdata->regs = devm_ioremap_resource(dev, res);
1981+
hdata->regs = devm_platform_ioremap_resource(pdev, 0);
19841982
if (IS_ERR(hdata->regs)) {
19851983
ret = PTR_ERR(hdata->regs);
19861984
return ret;

0 commit comments

Comments
 (0)