One cleanup
- Use devm_platform_ioremap_resource() helper function instead of old one. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEGaM000JtH4Vhbu4NZMZxZtnUbQkFAmFSxY4ACgkQZMZxZtnU bQljNA//Vu8OekMpgEgzPlWAIm8Z4knd9xuVmiMqVsyoWyI4QCRRkFnhnpenvS4q 5VKoD4TzaoR54Fvt/7L2jllu4bAoAdWDaeJkLpMZOIyjzXzRjVAaP4cndUWHZSMg kW0irMll+QyfuU0fYJ8OUVMHDdlWbup376YlX/exIgjbRPkhDJi/5bh7T70x7GEG noRfg+4EhecJ+acu0wtzt0FWzNzGSO5Qhh+KEsw+pe1JxvaPLnUAWECi9qSmnsMg h0T1SIAcRPtmzostrcykm1eQEDuPxHJvG3J3y2H//4CoXB+PSbXtPmyD4OFcRteW cfOOA9gesdNeFHdmGA++630OloeYlAlxbpHhiAZFIKvt6rs/o02Y7bL8DcdguYT8 3ADD0zkfi4xXU/jIwngHlBrS/V0HNzg61FoI5S675m84ZCg51eopYaQ5jatT9XbQ NDCny5NMcLV81tmz1Ka2xEPMA1k+z1EgwwhPn1CM9QbK1G66YEdrPA6aZt3eKKxw zGlOqrK6rfCsNFvAyhk8rQvIzd6BsULazqWIcVZ0CwOjrTbnJDlaC6QwcE8ZY+rR kArMz7MT9CSAC61vrKKxs6BajMTOq2WzTi6Mmstk0MsohKlFgeyCHpyob4qYWJkF bt32T7GbdEaCGdt+t1kw2JDG/ctkLZWKzCYYxEM+SUj+v+8SJZA= =iPah -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
78ea814179
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
@ -86,7 +86,6 @@ struct gsc_scaler {
|
||||
/*
|
||||
* A structure of gsc context.
|
||||
*
|
||||
* @regs_res: register resources.
|
||||
* @regs: memory mapped io registers.
|
||||
* @gsc_clk: gsc gate clock.
|
||||
* @sc: scaler infomations.
|
||||
@ -103,7 +102,6 @@ struct gsc_context {
|
||||
struct exynos_drm_ipp_formats *formats;
|
||||
unsigned int num_formats;
|
||||
|
||||
struct resource *regs_res;
|
||||
void __iomem *regs;
|
||||
const char **clk_names;
|
||||
struct clk *clocks[GSC_MAX_CLOCKS];
|
||||
@ -1272,9 +1270,7 @@ static int gsc_probe(struct platform_device *pdev)
|
||||
}
|
||||
}
|
||||
|
||||
/* 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);
|
||||
|
||||
|
@ -278,7 +278,6 @@ static const struct component_ops rotator_component_ops = {
|
||||
static int rotator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct resource *regs_res;
|
||||
struct rot_context *rot;
|
||||
const struct rot_variant *variant;
|
||||
int irq;
|
||||
@ -292,8 +291,7 @@ static int rotator_probe(struct platform_device *pdev)
|
||||
rot->formats = variant->formats;
|
||||
rot->num_formats = variant->num_formats;
|
||||
rot->dev = dev;
|
||||
regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
rot->regs = devm_ioremap_resource(dev, regs_res);
|
||||
rot->regs = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(rot->regs))
|
||||
return PTR_ERR(rot->regs);
|
||||
|
||||
|
@ -485,7 +485,6 @@ static const struct component_ops scaler_component_ops = {
|
||||
static int scaler_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct resource *regs_res;
|
||||
struct scaler_context *scaler;
|
||||
int irq;
|
||||
int ret, i;
|
||||
@ -498,8 +497,7 @@ static int scaler_probe(struct platform_device *pdev)
|
||||
(struct scaler_data *)of_device_get_match_data(dev);
|
||||
|
||||
scaler->dev = dev;
|
||||
regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
scaler->regs = devm_ioremap_resource(dev, regs_res);
|
||||
scaler->regs = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(scaler->regs))
|
||||
return PTR_ERR(scaler->regs);
|
||||
|
||||
|
@ -1957,7 +1957,6 @@ static int hdmi_probe(struct platform_device *pdev)
|
||||
struct hdmi_audio_infoframe *audio_infoframe;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct hdmi_context *hdata;
|
||||
struct resource *res;
|
||||
int ret;
|
||||
|
||||
hdata = devm_kzalloc(dev, sizeof(struct hdmi_context), GFP_KERNEL);
|
||||
@ -1979,8 +1978,7 @@ static int hdmi_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
hdata->regs = devm_ioremap_resource(dev, res);
|
||||
hdata->regs = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(hdata->regs)) {
|
||||
ret = PTR_ERR(hdata->regs);
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user