2021-09-07 08:05:03

by Cai,Huoqing

Subject: [PATCH] watchdog: iTCO_wdt: 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/watchdog/iTCO_wdt.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 643c6c2d0b72..ebf7e5bc1199 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -96,7 +96,6 @@ struct iTCO_wdt_private {
* NO_REBOOT flag is Memory-Mapped GCS register bit 5 (TCO version 2),
* or memory-mapped PMC register bit 4 (TCO version 3).
*/
- struct resource *gcs_pmc_res;
unsigned long __iomem *gcs_pmc;
/* the lock for io operations */
spinlock_t io_lock;
@@ -503,10 +502,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
*/
if (p->iTCO_version >= 2 && p->iTCO_version < 6 &&
!pdata->no_reboot_use_pmc) {
- p->gcs_pmc_res = platform_get_resource(pdev,
- IORESOURCE_MEM,
- ICH_RES_MEM_GCS_PMC);
- p->gcs_pmc = devm_ioremap_resource(dev, p->gcs_pmc_res);
+ p->gcs_pmc = devm_platform_ioremap_resource(pdev, ICH_RES_MEM_GCS_PMC);
if (IS_ERR(p->gcs_pmc))
return PTR_ERR(p->gcs_pmc);
}
--
2.25.1

2021-09-07 12:41:50

by Guenter Roeck

Subject: Re: [PATCH] watchdog: iTCO_wdt: Make use of the helper function devm_platform_ioremap_resource()

On Tue, Sep 07, 2021 at 03:42:29PM +0800, 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]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/iTCO_wdt.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 643c6c2d0b72..ebf7e5bc1199 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -96,7 +96,6 @@ struct iTCO_wdt_private {
> * NO_REBOOT flag is Memory-Mapped GCS register bit 5 (TCO version 2),
> * or memory-mapped PMC register bit 4 (TCO version 3).
> */
> - struct resource *gcs_pmc_res;
> unsigned long __iomem *gcs_pmc;
> /* the lock for io operations */
> spinlock_t io_lock;
> @@ -503,10 +502,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> */
> if (p->iTCO_version >= 2 && p->iTCO_version < 6 &&
> !pdata->no_reboot_use_pmc) {
> - p->gcs_pmc_res = platform_get_resource(pdev,
> - IORESOURCE_MEM,
> - ICH_RES_MEM_GCS_PMC);
> - p->gcs_pmc = devm_ioremap_resource(dev, p->gcs_pmc_res);
> + p->gcs_pmc = devm_platform_ioremap_resource(pdev, ICH_RES_MEM_GCS_PMC);
> if (IS_ERR(p->gcs_pmc))
> return PTR_ERR(p->gcs_pmc);
> }
> --
> 2.25.1
>