* [PATCH RESEND 6/7] watchdog: riowd: use devm_kzalloc()
@ 2013-04-29 9:36 Jingoo Han
2013-04-29 18:07 ` 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_kzalloc() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/watchdog/riowd.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 0040451..13363ad 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -183,7 +183,7 @@ static int riowd_probe(struct platform_device *op)
goto out;
err = -ENOMEM;
- p = kzalloc(sizeof(*p), GFP_KERNEL);
+ p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL);
if (!p)
goto out;
@@ -192,7 +192,7 @@ static int riowd_probe(struct platform_device *op)
p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
if (!p->regs) {
pr_err("Cannot map registers\n");
- goto out_free;
+ goto out;
}
/* Make miscdev useable right away */
riowd_device = p;
@@ -213,9 +213,6 @@ out_iounmap:
riowd_device = NULL;
of_iounmap(&op->resource[0], p->regs, 2);
-out_free:
- kfree(p);
-
out:
return err;
}
@@ -226,7 +223,6 @@ static int riowd_remove(struct platform_device *op)
misc_deregister(&riowd_miscdev);
of_iounmap(&op->resource[0], p->regs, 2);
- kfree(p);
return 0;
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH RESEND 6/7] watchdog: riowd: use devm_kzalloc()
2013-04-29 9:36 [PATCH RESEND 6/7] watchdog: riowd: use devm_kzalloc() Jingoo Han
@ 2013-04-29 18:07 ` Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2013-04-29 18:07 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Andrew Morton', linux-kernel, 'Wim Van Sebroeck',
linux-watchdog
On Mon, Apr 29, 2013 at 06:36:09PM +0900, Jingoo Han wrote:
> Use devm_kzalloc() to make cleanup paths simpler.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/watchdog/riowd.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
> index 0040451..13363ad 100644
> --- a/drivers/watchdog/riowd.c
> +++ b/drivers/watchdog/riowd.c
> @@ -183,7 +183,7 @@ static int riowd_probe(struct platform_device *op)
> goto out;
>
> err = -ENOMEM;
> - p = kzalloc(sizeof(*p), GFP_KERNEL);
> + p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL);
> if (!p)
> goto out;
>
That goto is really unnecessary. Just return -ENOMEM and drop the label.
Though that is really another logical change and should be done separately,
so
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> @@ -192,7 +192,7 @@ static int riowd_probe(struct platform_device *op)
> p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
> if (!p->regs) {
> pr_err("Cannot map registers\n");
> - goto out_free;
> + goto out;
> }
> /* Make miscdev useable right away */
> riowd_device = p;
> @@ -213,9 +213,6 @@ out_iounmap:
> riowd_device = NULL;
> of_iounmap(&op->resource[0], p->regs, 2);
>
> -out_free:
> - kfree(p);
> -
> out:
> return err;
> }
> @@ -226,7 +223,6 @@ static int riowd_remove(struct platform_device *op)
>
> misc_deregister(&riowd_miscdev);
> of_iounmap(&op->resource[0], p->regs, 2);
> - kfree(p);
>
> return 0;
> }
> --
> 1.7.2.5
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RESEND 6/7] watchdog: riowd: use devm_kzalloc()
@ 2013-05-02 5:51 Jingoo Han
0 siblings, 0 replies; 3+ messages in thread
From: Jingoo Han @ 2013-05-02 5:51 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Wim Van Sebroeck', linux-watchdog,
'Guenter Roeck', Jingoo Han
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/watchdog/riowd.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 0040451..13363ad 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -183,7 +183,7 @@ static int riowd_probe(struct platform_device *op)
goto out;
err = -ENOMEM;
- p = kzalloc(sizeof(*p), GFP_KERNEL);
+ p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL);
if (!p)
goto out;
@@ -192,7 +192,7 @@ static int riowd_probe(struct platform_device *op)
p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
if (!p->regs) {
pr_err("Cannot map registers\n");
- goto out_free;
+ goto out;
}
/* Make miscdev useable right away */
riowd_device = p;
@@ -213,9 +213,6 @@ out_iounmap:
riowd_device = NULL;
of_iounmap(&op->resource[0], p->regs, 2);
-out_free:
- kfree(p);
-
out:
return err;
}
@@ -226,7 +223,6 @@ static int riowd_remove(struct platform_device *op)
misc_deregister(&riowd_miscdev);
of_iounmap(&op->resource[0], p->regs, 2);
- kfree(p);
return 0;
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-02 5:52 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 6/7] watchdog: riowd: use devm_kzalloc() Jingoo Han
2013-04-29 18:07 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2013-05-02 5:51 Jingoo Han
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox