watchdog: nuc900_wdt: use devm_*() functions
PATCH RESEND 4/7 watchdog: nuc900_wdt: use devm_*() functions
Use devm_*() functions to make cleanup paths simpler.
--- drivers/watchdog/nuc900_wdt.c | 45 ++++++++-------------------------------- 1 files changed, 9 insertions(+), 36 deletions(-)
drivers/watchdog/nuc900_wdt.c +9 -36
@@ -246,7 +246,8 @@ static int nuc900wdt_probe(struct platform_device *pdev) {int ret =0 ; - nuc900_wdt =kzalloc (sizeof (struct nuc900_wdt ),GFP_KERNEL ); + nuc900_wdt =devm_kzalloc (&pdev->dev,sizeof (struct nuc900_wdt ), +GFP_KERNEL );if (!nuc900_wdt)return -ENOMEM ;
@@ -257,30 +258,18 @@ static int nuc900wdt_probe(struct platform_device *pdev) nuc900_wdt->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (nuc900_wdt->res ==NULL ) {dev_err (&pdev->dev,"no memory resource specified\n" ); - ret = -ENOENT ; - goto err_get; +return -ENOENT ; } -if (!request_mem_region (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res), pdev->name)) { -dev_err (&pdev->dev,"failed to get memory region\n" ); - ret = -ENOENT ; - goto err_get; - } - - nuc900_wdt->wdt_base =ioremap (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res)); -if (nuc900_wdt->wdt_base ==NULL ) { -dev_err (&pdev->dev,"failed to ioremap() region\n" ); - ret = -EINVAL ; - goto err_req; - } + nuc900_wdt->wdt_base =devm_ioremap_resource (&pdev->dev, + nuc900_wdt->res); +if (IS_ERR (nuc900_wdt->wdt_base)) +return PTR_ERR (nuc900_wdt->wdt_base); - nuc900_wdt->wdt_clock =clk_get (&pdev->dev,NULL ); + nuc900_wdt->wdt_clock =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (nuc900_wdt->wdt_clock)) {dev_err (&pdev->dev,"failed to find watchdog clock source\n" ); - ret =PTR_ERR (nuc900_wdt->wdt_clock); - goto err_map; +return PTR_ERR (nuc900_wdt->wdt_clock); }clk_enable (nuc900_wdt->wdt_clock);
@@ -298,14 +287,6 @@ static int nuc900wdt_probe(struct platform_device *pdev) err_clk:clk_disable (nuc900_wdt->wdt_clock); -clk_put (nuc900_wdt->wdt_clock); -err_map: -iounmap (nuc900_wdt->wdt_base); -err_req: -release_mem_region (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res)); -err_get: -kfree (nuc900_wdt);return ret; }
@@ -314,14 +295,6 @@ static int nuc900wdt_remove(struct platform_device *pdev)misc_deregister (&nuc900wdt_miscdev);clk_disable (nuc900_wdt->wdt_clock); -clk_put (nuc900_wdt->wdt_clock); - -iounmap (nuc900_wdt->wdt_base); - -release_mem_region (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res)); - -kfree (nuc900_wdt);return 0 ; }
Signature · 1 line
1.7.2.5
Guenter Roeck
maintainerQuoted 12 lines · Jingoo Han
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/nuc900_wdt.c | 45 ++++++++-------------------------------- 1 files changed, 9 insertions(+), 36 deletions(-)drivers/watchdog/nuc900_wdt.c +0
-0
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 250
Quoted 6 lines
drivers/watchdog/nuc900_wdt.c +2
-1@@ -246,7 +246,8 @@ static int nuc900wdt_probe(struct platform_device *pdev) {int ret =0 ; - nuc900_wdt =kzalloc (sizeof (struct nuc900_wdt ),GFP_KERNEL ); + nuc900_wdt =devm_kzalloc (&pdev->dev,sizeof (struct nuc900_wdt ), +GFP_KERNEL );
General hint: sizeof(*nuc900_wdt) is preferred by most maintainers.
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 259
Quoted 6 lines
drivers/watchdog/nuc900_wdt.c +0
-0if (!nuc900_wdt)return -ENOMEM ;@@ -257,30 +258,18 @@ static int nuc900wdt_probe(struct platform_device *pdev) nuc900_wdt->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (nuc900_wdt->res ==NULL ) {
It is no longer necessary to save the resource in nuc900_wdt, as it is only used in the probe function. So you might as well drop the variable from the structure and declare it locally.
Quoted 15 lines
drivers/watchdog/nuc900_wdt.c +1
-11dev_err (&pdev->dev,"no memory resource specified\n" ); - ret = -ENOENT ; - goto err_get; +return -ENOENT ; } -if (!request_mem_region (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res), pdev->name)) { -dev_err (&pdev->dev,"failed to get memory region\n" ); - ret = -ENOENT ; - goto err_get; - } - - nuc900_wdt->wdt_base =ioremap (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res));
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 268
Quoted 10 lines
drivers/watchdog/nuc900_wdt.c +4
-5-if (nuc900_wdt->wdt_base ==NULL ) { -dev_err (&pdev->dev,"failed to ioremap() region\n" ); - ret = -EINVAL ; - goto err_req; - } + nuc900_wdt->wdt_base =devm_ioremap_resource (&pdev->dev, + nuc900_wdt->res); +if (IS_ERR (nuc900_wdt->wdt_base)) +return PTR_ERR (nuc900_wdt->wdt_base);
Does devm_ioremap_resource() spit out an error if it fails ? If not, you might want to add an error message for consistency with the other messages.
Thanks,
Guenter
Quoted 25 lines
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]]
Sent: Tuesday, April 30, 2013 3:03 AM
To: Jingoo Han
Cc: 'Andrew Morton'; [email protected]; 'Wim Van Sebroeck'; [email protected]
Subject: Re: [PATCH RESEND 4/7] watchdog:nuc900_wdt: use devm_*() functionsQuoted 15 lines · Jingoo Han
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/nuc900_wdt.c | 45 ++++++++-------------------------------- 1 files changed, 9 insertions(+), 36 deletions(-)drivers/watchdog/nuc900_wdt.c +0
-0@@ -246,7 +246,8 @@ static int nuc900wdt_probe(struct platform_device *pdev) {int ret =0 ;
Quoted 5 lines
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 250
Quoted 3 lines
drivers/watchdog/nuc900_wdt.c +2
-1- nuc900_wdt =kzalloc (sizeof (struct nuc900_wdt ),GFP_KERNEL ); + nuc900_wdt =devm_kzalloc (&pdev->dev,sizeof (struct nuc900_wdt ), +GFP_KERNEL );General hint:
sizeof(*nuc900_wdt)is preferred by most maintainers.
OK, I will fix it.
Quoted 11 lines
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 259
Quoted 7 lines
drivers/watchdog/nuc900_wdt.c +0
-0if (!nuc900_wdt)return -ENOMEM ;@@ -257,30 +258,18 @@ static int nuc900wdt_probe(struct platform_device *pdev) nuc900_wdt->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (nuc900_wdt->res ==NULL ) {It is no longer necessary to save the resource in
nuc900_wdt, as it is only used in the probe function. So you might as well drop the variable from the structure and declare it locally.
OK, I will drop 'nuc900_wdt->res' variable from the 'nuc900_wdt' structure and declare it as logical variable.
Quoted 21 lines
Quoted 21 lines
drivers/watchdog/nuc900_wdt.c +1
-16dev_err (&pdev->dev,"no memory resource specified\n" ); - ret = -ENOENT ; - goto err_get; +return -ENOENT ; } -if (!request_mem_region (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res), pdev->name)) { -dev_err (&pdev->dev,"failed to get memory region\n" ); - ret = -ENOENT ; - goto err_get; - } - - nuc900_wdt->wdt_base =ioremap (nuc900_wdt->res->start, -resource_size (nuc900_wdt->res)); -if (nuc900_wdt->wdt_base ==NULL ) { -dev_err (&pdev->dev,"failed to ioremap() region\n" ); - ret = -EINVAL ; - goto err_req; - }
Quoted 8 lines
drivers/watchdog/nuc900_wdt.c static int nuc900wdt_probe(struct platform_device *pdev) · line 268
Quoted 5 lines
drivers/watchdog/nuc900_wdt.c +4
-0+ nuc900_wdt->wdt_base =devm_ioremap_resource (&pdev->dev, + nuc900_wdt->res); +if (IS_ERR (nuc900_wdt->wdt_base)) +return PTR_ERR (nuc900_wdt->wdt_base);Does
devm_ioremap_resource()spit out an error if it fails ? If not, you might want to add an error message for consistency with the other messages.
I CC'ed Thierry Reding who is the author of devm_ioremap_resource().
Um, devm_ioremap_resource() spits out an error if it fails.
According to commit message of the previous patch made by Thierry Reding,
"devm_ioremap_resource() provides its own error messages so all explicit error messages can be removed from the failure code paths."
Thus, there is no need to add an error message.
Best regards,
Jingoo Han
Quoted 3 lines
Thanks,
Guenter