Message ID | 20210907074237.2808-1-caihuoqing@baidu.com |
---|---|
State | New |
Headers | show |
Series | watchdog: rti-wdt: Make use of the helper function devm_platform_ioremap_resource() | expand |
On Tue, Sep 07, 2021 at 03:42:36PM +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 <caihuoqing@baidu.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/rti_wdt.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c > index 359302f71f7e..117bc2a8eb0a 100644 > --- a/drivers/watchdog/rti_wdt.c > +++ b/drivers/watchdog/rti_wdt.c > @@ -194,7 +194,6 @@ static int rti_wdt_probe(struct platform_device *pdev) > { > int ret = 0; > struct device *dev = &pdev->dev; > - struct resource *wdt_mem; > struct watchdog_device *wdd; > struct rti_wdt_device *wdt; > struct clk *clk; > @@ -246,8 +245,7 @@ static int rti_wdt_probe(struct platform_device *pdev) > watchdog_set_nowayout(wdd, 1); > watchdog_set_restart_priority(wdd, 128); > > - wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - wdt->base = devm_ioremap_resource(dev, wdt_mem); > + wdt->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(wdt->base)) { > ret = PTR_ERR(wdt->base); > goto err_iomap; > -- > 2.25.1 >
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index 359302f71f7e..117bc2a8eb0a 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -194,7 +194,6 @@ static int rti_wdt_probe(struct platform_device *pdev) { int ret = 0; struct device *dev = &pdev->dev; - struct resource *wdt_mem; struct watchdog_device *wdd; struct rti_wdt_device *wdt; struct clk *clk; @@ -246,8 +245,7 @@ static int rti_wdt_probe(struct platform_device *pdev) watchdog_set_nowayout(wdd, 1); watchdog_set_restart_priority(wdd, 128); - wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - wdt->base = devm_ioremap_resource(dev, wdt_mem); + wdt->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(wdt->base)) { ret = PTR_ERR(wdt->base); goto err_iomap;
Use the devm_platform_ioremap_resource() helper instead of calling platform_get_resource() and devm_ioremap_resource() separately Signed-off-by: Cai Huoqing <caihuoqing@baidu.com> --- drivers/watchdog/rti_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)