Re: [PATCH] clocksource: sh_cmt: Use devm_* managed helpers

[Sachin Kamat]

Hi Laurent,

On 18 June 2013 16:29, Laurent Pinchart
<laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> wrote:
> This simplifies the main error path by getting rid of it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
>  drivers/clocksource/sh_cmt.c | 40 ++++++++++++++--------------------------
>  1 file changed, 14 insertions(+), 26 deletions(-)
>
> The patch is based on top of renesas-next-20130618 plus Magnus'
> "clocksource: sh_cmt: 32-bit control register support" patch.
>
> diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
> index 0965e98..7001e4d 100644
> --- a/drivers/clocksource/sh_cmt.c
> +++ b/drivers/clocksource/sh_cmt.c
> @@ -681,20 +681,18 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
>         struct sh_timer_config *cfg = pdev->dev.platform_data;
>         struct resource *res, *res2;
>         int irq, ret;
> -       ret = -ENXIO;
>
> -       memset(p, 0, sizeof(*p));
>         p->pdev = pdev;
>
>         if (!cfg) {
>                 dev_err(&p->pdev->dev, "missing platform data\n");
> -               goto err0;
> +               return -ENXIO;
>         }
>
>         res = platform_get_resource(p->pdev, IORESOURCE_MEM, 0);
>         if (!res) {
>                 dev_err(&p->pdev->dev, "failed to get I/O memory\n");
> -               goto err0;
> +               return -ENXIO;
>         }
>
>         /* optional resource for the shared timer start/stop register */
> @@ -703,23 +701,23 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
>         irq = platform_get_irq(p->pdev, 0);
>         if (irq < 0) {
>                 dev_err(&p->pdev->dev, "failed to get irq\n");
> -               goto err0;
> +               return -ENXIO;
>         }
>
>         /* map memory, let mapbase point to our channel */
> -       p->mapbase = ioremap_nocache(res->start, resource_size(res));
> +       p->mapbase = devm_ioremap_resource(&pdev->dev, res);
>         if (p->mapbase == NULL) {

You should check for  IS_ERR (p->mapbase) and return PTR_ERR(p->mapbase)

>                 dev_err(&p->pdev->dev, "failed to remap I/O memory\n");

This error message is not required as devm_ioremap_resource prints its own.

-- 
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/