2021-09-01 05:47:41

by Cai,Huoqing

Subject: [PATCH] media: cec: ao-cec: Make use of the helper function devm_platform_ioremap_resource()

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <[email protected]>
---
drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +---
drivers/media/cec/platform/meson/ao-cec.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/media/cec/platform/meson/ao-cec-g12a.c b/drivers/media/cec/platform/meson/ao-cec-g12a.c
index 891533060d49..68fe6d6a8178 100644
--- a/drivers/media/cec/platform/meson/ao-cec-g12a.c
+++ b/drivers/media/cec/platform/meson/ao-cec-g12a.c
@@ -633,7 +633,6 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)
{
struct meson_ao_cec_g12a_device *ao_cec;
struct device *hdmi_dev;
- struct resource *res;
void __iomem *base;
int ret, irq;

@@ -664,8 +663,7 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)

ao_cec->adap->owner = THIS_MODULE;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- base = devm_ioremap_resource(&pdev->dev, res);
+ base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto out_probe_adapter;
diff --git a/drivers/media/cec/platform/meson/ao-cec.c b/drivers/media/cec/platform/meson/ao-cec.c
index 09aff82c3773..6b440f0635d9 100644
--- a/drivers/media/cec/platform/meson/ao-cec.c
+++ b/drivers/media/cec/platform/meson/ao-cec.c
@@ -602,7 +602,6 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
{
struct meson_ao_cec_device *ao_cec;
struct device *hdmi_dev;
- struct resource *res;
int ret, irq;

hdmi_dev = cec_notifier_parse_hdmi_phandle(&pdev->dev);
@@ -626,8 +625,7 @@ static int meson_ao_cec_probe(struct platform_device *pdev)

ao_cec->adap->owner = THIS_MODULE;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- ao_cec->base = devm_ioremap_resource(&pdev->dev, res);
+ ao_cec->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(ao_cec->base)) {
ret = PTR_ERR(ao_cec->base);
goto out_probe_adapter;
--
2.25.1

2021-09-01 18:49:52

by Neil Armstrong

Subject: Re: [PATCH] media: cec: ao-cec: Make use of the helper function devm_platform_ioremap_resource()

On 01/09/2021 07:45, Cai Huoqing wrote:
> Use the devm_platform_ioremap_resource() helper instead of
> calling platform_get_resource() and devm_ioremap_resource()
> separately
>
> Signed-off-by: Cai Huoqing <[email protected]>
> ---
> drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +---
> drivers/media/cec/platform/meson/ao-cec.c | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/cec/platform/meson/ao-cec-g12a.c b/drivers/media/cec/platform/meson/ao-cec-g12a.c
> index 891533060d49..68fe6d6a8178 100644
> --- a/drivers/media/cec/platform/meson/ao-cec-g12a.c
> +++ b/drivers/media/cec/platform/meson/ao-cec-g12a.c
> @@ -633,7 +633,6 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)
> {
> struct meson_ao_cec_g12a_device *ao_cec;
> struct device *hdmi_dev;
> - struct resource *res;
> void __iomem *base;
> int ret, irq;
>
> @@ -664,8 +663,7 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)
>
> ao_cec->adap->owner = THIS_MODULE;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - base = devm_ioremap_resource(&pdev->dev, res);
> + base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(base)) {
> ret = PTR_ERR(base);
> goto out_probe_adapter;
> diff --git a/drivers/media/cec/platform/meson/ao-cec.c b/drivers/media/cec/platform/meson/ao-cec.c
> index 09aff82c3773..6b440f0635d9 100644
> --- a/drivers/media/cec/platform/meson/ao-cec.c
> +++ b/drivers/media/cec/platform/meson/ao-cec.c
> @@ -602,7 +602,6 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
> {
> struct meson_ao_cec_device *ao_cec;
> struct device *hdmi_dev;
> - struct resource *res;
> int ret, irq;
>
> hdmi_dev = cec_notifier_parse_hdmi_phandle(&pdev->dev);
> @@ -626,8 +625,7 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
>
> ao_cec->adap->owner = THIS_MODULE;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - ao_cec->base = devm_ioremap_resource(&pdev->dev, res);
> + ao_cec->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(ao_cec->base)) {
> ret = PTR_ERR(ao_cec->base);
> goto out_probe_adapter;
>

Reviewed-by: Neil Armstrong <[email protected]>