| Message ID | 20210907074223.2706-1-caihuoqing@baidu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: ar7_wdt: Make use of the helper function devm_platform_ioremap_resource_byname() | expand |
On Tue, Sep 07, 2021 at 03:42:22PM +0800, Cai Huoqing wrote: > Use the devm_platform_ioremap_resource_byname() helper instead of > calling platform_get_resource_byname() and devm_ioremap_resource() > separately > > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/ar7_wdt.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c > index ff37dc91057d..743e171d97a3 100644 > --- a/drivers/watchdog/ar7_wdt.c > +++ b/drivers/watchdog/ar7_wdt.c > @@ -63,8 +63,6 @@ static DEFINE_SPINLOCK(wdt_lock); > /* XXX currently fixed, allows max margin ~68.72 secs */ > #define prescale_value 0xffff > > -/* Resource of the WDT registers */ > -static struct resource *ar7_regs_wdt; > /* Pointer to the remapped WDT IO space */ > static struct ar7_wdt *ar7_wdt; > > @@ -265,9 +263,7 @@ static int ar7_wdt_probe(struct platform_device *pdev) > { > int rc; > > - ar7_regs_wdt = > - platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); > - ar7_wdt = devm_ioremap_resource(&pdev->dev, ar7_regs_wdt); > + ar7_wdt = devm_platform_ioremap_resource_byname(pdev, "regs"); > if (IS_ERR(ar7_wdt)) > return PTR_ERR(ar7_wdt); > > -- > 2.25.1 >
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c index ff37dc91057d..743e171d97a3 100644 --- a/drivers/watchdog/ar7_wdt.c +++ b/drivers/watchdog/ar7_wdt.c @@ -63,8 +63,6 @@ static DEFINE_SPINLOCK(wdt_lock); /* XXX currently fixed, allows max margin ~68.72 secs */ #define prescale_value 0xffff -/* Resource of the WDT registers */ -static struct resource *ar7_regs_wdt; /* Pointer to the remapped WDT IO space */ static struct ar7_wdt *ar7_wdt; @@ -265,9 +263,7 @@ static int ar7_wdt_probe(struct platform_device *pdev) { int rc; - ar7_regs_wdt = - platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); - ar7_wdt = devm_ioremap_resource(&pdev->dev, ar7_regs_wdt); + ar7_wdt = devm_platform_ioremap_resource_byname(pdev, "regs"); if (IS_ERR(ar7_wdt)) return PTR_ERR(ar7_wdt);
Use the devm_platform_ioremap_resource_byname() helper instead of calling platform_get_resource_byname() and devm_ioremap_resource() separately Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> --- drivers/watchdog/ar7_wdt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)