Use devm_ioremap() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <[email protected]>
---
drivers/watchdog/mv64x60_wdt.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index c7fb878..e4cf980 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -276,7 +276,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
if (!r)
return -ENODEV;
- mv64x60_wdt_regs = ioremap(r->start, resource_size(r));
+ mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
if (mv64x60_wdt_regs == NULL)
return -ENOMEM;
@@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev)
mv64x60_wdt_handler_disable();
- iounmap(mv64x60_wdt_regs);
-
return 0;
}
--
1.7.2.5
On Mon, Apr 29, 2013 at 06:35:15PM +0900, Jingoo Han wrote:
> Use devm_ioremap() to make cleanup paths simpler.
>
> Signed-off-by: Jingoo Han <[email protected]>
This patch also addresses the missing call to iounmap() if the call
to misc_register fails.
Reviewed-by: Guenter Roeck <[email protected]>
> ---
> drivers/watchdog/mv64x60_wdt.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
> index c7fb878..e4cf980 100644
> --- a/drivers/watchdog/mv64x60_wdt.c
> +++ b/drivers/watchdog/mv64x60_wdt.c
> @@ -276,7 +276,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
> if (!r)
> return -ENODEV;
>
> - mv64x60_wdt_regs = ioremap(r->start, resource_size(r));
> + mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
> if (mv64x60_wdt_regs == NULL)
> return -ENOMEM;
>
> @@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev)
>
> mv64x60_wdt_handler_disable();
>
> - iounmap(mv64x60_wdt_regs);
> -
> return 0;
> }
>
> --
> 1.7.2.5
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Tuesday, April 30, 2013 2:55 AM, Guenter Roeck wrote:
> On Mon, Apr 29, 2013 at 06:35:15PM +0900, Jingoo Han wrote:
> > Use devm_ioremap() to make cleanup paths simpler.
> >
> > Signed-off-by: Jingoo Han <[email protected]>
>
> This patch also addresses the missing call to iounmap() if the call
> to misc_register fails.
When devm_ioremap() is used, there is no need to call devm_iounmap().
It is because, these resource managed functions such as
devm_ioremap() allow the driver core to automatically
clean up any allocation, when probe function fails.
>
> Reviewed-by: Guenter Roeck <[email protected]>
Thank you for your reviewing.
Best regards,
Jingoo Han
>
> > ---
> > drivers/watchdog/mv64x60_wdt.c | 4 +---
> > 1 files changed, 1 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
> > index c7fb878..e4cf980 100644
> > --- a/drivers/watchdog/mv64x60_wdt.c
> > +++ b/drivers/watchdog/mv64x60_wdt.c
> > @@ -276,7 +276,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
> > if (!r)
> > return -ENODEV;
> >
> > - mv64x60_wdt_regs = ioremap(r->start, resource_size(r));
> > + mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
> > if (mv64x60_wdt_regs == NULL)
> > return -ENOMEM;
> >
> > @@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev)
> >
> > mv64x60_wdt_handler_disable();
> >
> > - iounmap(mv64x60_wdt_regs);
> > -
> > return 0;
> > }
> >
> > --
> > 1.7.2.5
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
On Tue, Apr 30, 2013 at 10:56:39AM +0900, Jingoo Han wrote:
> On Tuesday, April 30, 2013 2:55 AM, Guenter Roeck wrote:
> > On Mon, Apr 29, 2013 at 06:35:15PM +0900, Jingoo Han wrote:
> > > Use devm_ioremap() to make cleanup paths simpler.
> > >
> > > Signed-off-by: Jingoo Han <[email protected]>
> >
> > This patch also addresses the missing call to iounmap() if the call
> > to misc_register fails.
>
> When devm_ioremap() is used, there is no need to call devm_iounmap().
>
> It is because, these resource managed functions such as
> devm_ioremap() allow the driver core to automatically
> clean up any allocation, when probe function fails.
>
Same response as before. Please read my note above. It says clearly
"this patch _addresses_ ...", not "this patch _creates_ ...".
Guenter