2023-03-14 08:02:42

by Yang Li

[permalink] [raw]
Subject: [PATCH -next 2/2] drm/arm/hdlcd: Use devm_platform_ioremap_resource()

According to commit 7945f929f1a7 ("drivers: provide
devm_platform_ioremap_resource()"), convert platform_get_resource(),
devm_ioremap_resource() to a single call to Use
devm_platform_ioremap_resource(), as this is exactly what this function
does.

Since 'struct platform_device *pdev = to_platform_device(drm->dev)',
'drm->dev' is equivalent to 'pdev->deva'.

Signed-off-by: Yang Li <[email protected]>
---
drivers/gpu/drm/arm/hdlcd_drv.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index e3507dd6f82a..a86b317c1312 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -100,7 +100,6 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
{
struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);
struct platform_device *pdev = to_platform_device(drm->dev);
- struct resource *res;
u32 version;
int ret;

@@ -115,8 +114,7 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
atomic_set(&hdlcd->dma_end_count, 0);
#endif

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hdlcd->mmio = devm_ioremap_resource(drm->dev, res);
+ hdlcd->mmio = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(hdlcd->mmio)) {
DRM_ERROR("failed to map control registers area\n");
ret = PTR_ERR(hdlcd->mmio);
--
2.20.1.7.g153144c



2023-03-14 08:02:44

by Yang Li

[permalink] [raw]
Subject: [PATCH -next 1/2] drm/arm/malidp: Use devm_platform_get_and_ioremap_resource()

According to commit 890cc39a8799 ("drivers: provide
devm_platform_get_and_ioremap_resource()"), convert
platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Since 'struct platform_device *pdev = to_platform_device(dev)',
'pdev->dev' is equivalent to 'dev'.

Signed-off-by: Yang Li <[email protected]>
---
drivers/gpu/drm/arm/malidp_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index cf040e2e9efe..e220bfc85b2e 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -724,8 +724,7 @@ static int malidp_bind(struct device *dev)
hwdev->hw = (struct malidp_hw *)of_device_get_match_data(dev);
malidp->dev = hwdev;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hwdev->regs = devm_ioremap_resource(dev, res);
+ hwdev->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(hwdev->regs))
return PTR_ERR(hwdev->regs);

--
2.20.1.7.g153144c


2023-03-14 13:45:26

by Liviu Dudau

[permalink] [raw]
Subject: Re: [PATCH -next 2/2] drm/arm/hdlcd: Use devm_platform_ioremap_resource()

On Tue, Mar 14, 2023 at 04:02:30PM +0800, Yang Li wrote:
> According to commit 7945f929f1a7 ("drivers: provide
> devm_platform_ioremap_resource()"), convert platform_get_resource(),
> devm_ioremap_resource() to a single call to Use
> devm_platform_ioremap_resource(), as this is exactly what this function
> does.
>
> Since 'struct platform_device *pdev = to_platform_device(drm->dev)',
> 'drm->dev' is equivalent to 'pdev->deva'.
>
> Signed-off-by: Yang Li <[email protected]>

Acked-by: Liviu Dudau <[email protected]>

Thanks for cleaning this up!

Best regards,
Liviu

> ---
> drivers/gpu/drm/arm/hdlcd_drv.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
> index e3507dd6f82a..a86b317c1312 100644
> --- a/drivers/gpu/drm/arm/hdlcd_drv.c
> +++ b/drivers/gpu/drm/arm/hdlcd_drv.c
> @@ -100,7 +100,6 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
> {
> struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);
> struct platform_device *pdev = to_platform_device(drm->dev);
> - struct resource *res;
> u32 version;
> int ret;
>
> @@ -115,8 +114,7 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
> atomic_set(&hdlcd->dma_end_count, 0);
> #endif
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - hdlcd->mmio = devm_ioremap_resource(drm->dev, res);
> + hdlcd->mmio = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(hdlcd->mmio)) {
> DRM_ERROR("failed to map control registers area\n");
> ret = PTR_ERR(hdlcd->mmio);
> --
> 2.20.1.7.g153144c
>

--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯

2023-03-14 13:48:46

by Liviu Dudau

[permalink] [raw]
Subject: Re: [PATCH -next 1/2] drm/arm/malidp: Use devm_platform_get_and_ioremap_resource()

On Tue, Mar 14, 2023 at 04:02:31PM +0800, Yang Li wrote:
> According to commit 890cc39a8799 ("drivers: provide
> devm_platform_get_and_ioremap_resource()"), convert
> platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
>
> Since 'struct platform_device *pdev = to_platform_device(dev)',
> 'pdev->dev' is equivalent to 'dev'.
>
> Signed-off-by: Yang Li <[email protected]>

Acked-by: Liviu Dudau <[email protected]>

Thanks for the cleanup! I will pull this patch and the hdlcd one into
drm-misc-next by the end of the week.

Best regards,
Liviu

> ---
> drivers/gpu/drm/arm/malidp_drv.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> index cf040e2e9efe..e220bfc85b2e 100644
> --- a/drivers/gpu/drm/arm/malidp_drv.c
> +++ b/drivers/gpu/drm/arm/malidp_drv.c
> @@ -724,8 +724,7 @@ static int malidp_bind(struct device *dev)
> hwdev->hw = (struct malidp_hw *)of_device_get_match_data(dev);
> malidp->dev = hwdev;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - hwdev->regs = devm_ioremap_resource(dev, res);
> + hwdev->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> if (IS_ERR(hwdev->regs))
> return PTR_ERR(hwdev->regs);
>
> --
> 2.20.1.7.g153144c
>

--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯