* [PATCH RESEND 7/7] watchdog: ts72xx_wdt: use devm_*() functions
@ 2013-04-29 9:36 Jingoo Han
2013-04-29 18:09 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Jingoo Han @ 2013-04-29 9:36 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Wim Van Sebroeck', linux-watchdog, Jingoo Han
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/watchdog/ts72xx_wdt.c | 64 +++++++----------------------------------
1 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index b8a9245..b19ca75 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -396,7 +396,7 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
struct resource *r1, *r2;
int error = 0;
- wdt = kzalloc(sizeof(struct ts72xx_wdt), GFP_KERNEL);
+ wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL);
if (!wdt) {
dev_err(&pdev->dev, "failed to allocate memory\n");
return -ENOMEM;
@@ -405,44 +405,22 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r1) {
dev_err(&pdev->dev, "failed to get memory resource\n");
- error = -ENODEV;
- goto fail;
- }
-
- r1 = request_mem_region(r1->start, resource_size(r1), pdev->name);
- if (!r1) {
- dev_err(&pdev->dev, "cannot request memory region\n");
- error = -EBUSY;
- goto fail;
+ return -ENODEV;
}
- wdt->control_reg = ioremap(r1->start, resource_size(r1));
- if (!wdt->control_reg) {
- dev_err(&pdev->dev, "failed to map memory\n");
- error = -ENODEV;
- goto fail_free_control;
- }
+ wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
+ if (IS_ERR(wdt->control_reg))
+ return PTR_ERR(wdt->control_reg);
r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!r2) {
dev_err(&pdev->dev, "failed to get memory resource\n");
- error = -ENODEV;
- goto fail_unmap_control;
+ return -ENODEV;
}
- r2 = request_mem_region(r2->start, resource_size(r2), pdev->name);
- if (!r2) {
- dev_err(&pdev->dev, "cannot request memory region\n");
- error = -EBUSY;
- goto fail_unmap_control;
- }
-
- wdt->feed_reg = ioremap(r2->start, resource_size(r2));
- if (!wdt->feed_reg) {
- dev_err(&pdev->dev, "failed to map memory\n");
- error = -ENODEV;
- goto fail_free_feed;
- }
+ wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2);
+ if (IS_ERR(wdt->feed_reg))
+ return PTR_ERR(wdt->feed_reg);
platform_set_drvdata(pdev, wdt);
ts72xx_wdt_pdev = pdev;
@@ -455,45 +433,25 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
error = misc_register(&ts72xx_wdt_miscdev);
if (error) {
dev_err(&pdev->dev, "failed to register miscdev\n");
- goto fail_unmap_feed;
+ goto fail;
}
dev_info(&pdev->dev, "TS-72xx Watchdog driver\n");
return 0;
-fail_unmap_feed:
- platform_set_drvdata(pdev, NULL);
- iounmap(wdt->feed_reg);
-fail_free_feed:
- release_mem_region(r2->start, resource_size(r2));
-fail_unmap_control:
- iounmap(wdt->control_reg);
-fail_free_control:
- release_mem_region(r1->start, resource_size(r1));
fail:
- kfree(wdt);
+ platform_set_drvdata(pdev, NULL);
return error;
}
static int ts72xx_wdt_remove(struct platform_device *pdev)
{
- struct ts72xx_wdt *wdt = platform_get_drvdata(pdev);
- struct resource *res;
int error;
error = misc_deregister(&ts72xx_wdt_miscdev);
platform_set_drvdata(pdev, NULL);
- iounmap(wdt->feed_reg);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- release_mem_region(res->start, resource_size(res));
-
- iounmap(wdt->control_reg);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(res->start, resource_size(res));
-
- kfree(wdt);
return error;
}
--
1.7.2.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 7/7] watchdog: ts72xx_wdt: use devm_*() functions
2013-04-29 9:36 [PATCH RESEND 7/7] watchdog: ts72xx_wdt: use devm_*() functions Jingoo Han
@ 2013-04-29 18:09 ` Guenter Roeck
2013-04-30 2:18 ` Jingoo Han
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2013-04-29 18:09 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Andrew Morton', linux-kernel, 'Wim Van Sebroeck',
linux-watchdog
On Mon, Apr 29, 2013 at 06:36:34PM +0900, Jingoo Han wrote:
> Use devm_*() functions to make cleanup paths simpler.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/watchdog/ts72xx_wdt.c | 64 +++++++----------------------------------
> 1 files changed, 11 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
> index b8a9245..b19ca75 100644
> --- a/drivers/watchdog/ts72xx_wdt.c
> +++ b/drivers/watchdog/ts72xx_wdt.c
> @@ -396,7 +396,7 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
> struct resource *r1, *r2;
> int error = 0;
>
> - wdt = kzalloc(sizeof(struct ts72xx_wdt), GFP_KERNEL);
> + wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL);
> if (!wdt) {
> dev_err(&pdev->dev, "failed to allocate memory\n");
> return -ENOMEM;
> @@ -405,44 +405,22 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
> r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!r1) {
> dev_err(&pdev->dev, "failed to get memory resource\n");
> - error = -ENODEV;
> - goto fail;
> - }
> -
> - r1 = request_mem_region(r1->start, resource_size(r1), pdev->name);
> - if (!r1) {
> - dev_err(&pdev->dev, "cannot request memory region\n");
> - error = -EBUSY;
> - goto fail;
> + return -ENODEV;
> }
>
> - wdt->control_reg = ioremap(r1->start, resource_size(r1));
> - if (!wdt->control_reg) {
> - dev_err(&pdev->dev, "failed to map memory\n");
> - error = -ENODEV;
> - goto fail_free_control;
> - }
> + wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
> + if (IS_ERR(wdt->control_reg))
> + return PTR_ERR(wdt->control_reg);
>
> r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> if (!r2) {
> dev_err(&pdev->dev, "failed to get memory resource\n");
> - error = -ENODEV;
> - goto fail_unmap_control;
> + return -ENODEV;
> }
>
> - r2 = request_mem_region(r2->start, resource_size(r2), pdev->name);
> - if (!r2) {
> - dev_err(&pdev->dev, "cannot request memory region\n");
> - error = -EBUSY;
> - goto fail_unmap_control;
> - }
> -
> - wdt->feed_reg = ioremap(r2->start, resource_size(r2));
> - if (!wdt->feed_reg) {
> - dev_err(&pdev->dev, "failed to map memory\n");
> - error = -ENODEV;
> - goto fail_free_feed;
> - }
> + wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2);
> + if (IS_ERR(wdt->feed_reg))
> + return PTR_ERR(wdt->feed_reg);
>
You have a mix of returns with and without error messages now. Can you make sure
that this is all consistent ?
Thanks,
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 7/7] watchdog: ts72xx_wdt: use devm_*() functions
2013-04-29 18:09 ` Guenter Roeck
@ 2013-04-30 2:18 ` Jingoo Han
0 siblings, 0 replies; 3+ messages in thread
From: Jingoo Han @ 2013-04-30 2:18 UTC (permalink / raw)
To: 'Guenter Roeck'
Cc: 'Andrew Morton', linux-kernel, 'Wim Van Sebroeck',
linux-watchdog, 'Thierry Reding', 'Jingoo Han'
On Tuesday, April 30, 2013 3:10 AM, Guenter Roeck wrote:
> On Mon, Apr 29, 2013 at 06:36:34PM +0900, Jingoo Han wrote:
> > Use devm_*() functions to make cleanup paths simpler.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> > drivers/watchdog/ts72xx_wdt.c | 64 +++++++----------------------------------
> > 1 files changed, 11 insertions(+), 53 deletions(-)
> >
> > diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
> > index b8a9245..b19ca75 100644
> > --- a/drivers/watchdog/ts72xx_wdt.c
> > +++ b/drivers/watchdog/ts72xx_wdt.c
> > @@ -396,7 +396,7 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
> > struct resource *r1, *r2;
> > int error = 0;
> >
> > - wdt = kzalloc(sizeof(struct ts72xx_wdt), GFP_KERNEL);
> > + wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL);
> > if (!wdt) {
> > dev_err(&pdev->dev, "failed to allocate memory\n");
> > return -ENOMEM;
> > @@ -405,44 +405,22 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
> > r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > if (!r1) {
> > dev_err(&pdev->dev, "failed to get memory resource\n");
> > - error = -ENODEV;
> > - goto fail;
> > - }
> > -
> > - r1 = request_mem_region(r1->start, resource_size(r1), pdev->name);
> > - if (!r1) {
> > - dev_err(&pdev->dev, "cannot request memory region\n");
> > - error = -EBUSY;
> > - goto fail;
> > + return -ENODEV;
> > }
> >
> > - wdt->control_reg = ioremap(r1->start, resource_size(r1));
> > - if (!wdt->control_reg) {
> > - dev_err(&pdev->dev, "failed to map memory\n");
> > - error = -ENODEV;
> > - goto fail_free_control;
> > - }
> > + wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
> > + if (IS_ERR(wdt->control_reg))
> > + return PTR_ERR(wdt->control_reg);
> >
> > r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> > if (!r2) {
> > dev_err(&pdev->dev, "failed to get memory resource\n");
> > - error = -ENODEV;
> > - goto fail_unmap_control;
> > + return -ENODEV;
> > }
> >
> > - r2 = request_mem_region(r2->start, resource_size(r2), pdev->name);
> > - if (!r2) {
> > - dev_err(&pdev->dev, "cannot request memory region\n");
> > - error = -EBUSY;
> > - goto fail_unmap_control;
> > - }
> > -
> > - wdt->feed_reg = ioremap(r2->start, resource_size(r2));
> > - if (!wdt->feed_reg) {
> > - dev_err(&pdev->dev, "failed to map memory\n");
> > - error = -ENODEV;
> > - goto fail_free_feed;
> > - }
> > + wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2);
> > + if (IS_ERR(wdt->feed_reg))
> > + return PTR_ERR(wdt->feed_reg);
> >
> You have a mix of returns with and without error messages now. Can you make sure
> that this is all consistent ?
As I previously mentioned, there is no need to add an error message.
(http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg426498.html)
Best regards,
Jingoo Han
>
> Thanks,
> Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-30 2:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-29 9:36 [PATCH RESEND 7/7] watchdog: ts72xx_wdt: use devm_*() functions Jingoo Han
2013-04-29 18:09 ` Guenter Roeck
2013-04-30 2:18 ` Jingoo Han
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®