linux-kernel - Re: [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1758769.0xLW0L5ybf@avalon>
Date:	Wed, 29 May 2013 05:37:01 +0200
From:	Laurent Pinchart <laurent.pinchart@...asonboard.com>
To:	Prabhakar Lad <prabhakar.csengg@...il.com>
Cc:	Hans Verkuil <hans.verkuil@...co.com>,
	Mauro Carvalho Chehab <mchehab@...hat.com>,
	LMML <linux-media@...r.kernel.org>,
	DLOS <davinci-linux-open-source@...ux.davincidsp.com>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api

On Sunday 26 May 2013 17:30:09 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@...il.com>
> 
> use devm_request_irq() instead of request_irq(). This ensures
> more consistent error values and simplifies error paths.
> 
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@...il.com>

Acked-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>

> ---
>  drivers/media/platform/davinci/vpif_capture.c |   38 ++++++++--------------
>  1 files changed, 12 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/media/platform/davinci/vpif_capture.c
> b/drivers/media/platform/davinci/vpif_capture.c index 38c1fba..5e1e5f6
> 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -2082,14 +2082,14 @@ static __init int vpif_probe(struct platform_device
> *pdev)
> 
>  	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
>  		for (i = res->start; i <= res->end; i++) {
> -			if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
> -					"VPIF_Capture", (void *)
> -					(&vpif_obj.dev[res_idx]->channel_id))) {
> -				err = -EBUSY;
> -				for (j = 0; j < i; j++)
> -					free_irq(j, (void *)
> -					(&vpif_obj.dev[res_idx]->channel_id));
> -				goto vpif_int_err;
> +			err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
> +					     IRQF_SHARED, "VPIF_Capture",
> +					     (void *)(&vpif_obj.dev[res_idx]->
> +					     channel_id));
> +			if (err) {
> +				err = -EINVAL;
> +				goto vpif_unregister;
> +
>  			}
>  		}
>  		res_idx++;
> @@ -2106,7 +2106,7 @@ static __init int vpif_probe(struct platform_device
> *pdev) video_device_release(ch->video_dev);
>  			}
>  			err = -ENOMEM;
> -			goto vpif_int_err;
> +			goto vpif_unregister;
>  		}
> 
>  		/* Initialize field of video device */
> @@ -2207,13 +2207,9 @@ vpif_sd_error:
>  		/* Note: does nothing if ch->video_dev == NULL */
>  		video_device_release(ch->video_dev);
>  	}
> -vpif_int_err:
> +vpif_unregister:
>  	v4l2_device_unregister(&vpif_obj.v4l2_dev);
> -	for (i = 0; i < res_idx; i++) {
> -		res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
> -		for (j = res->start; j <= res->end; j++)
> -			free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
> -	}
> +
>  	return err;
>  }
> 
> @@ -2225,18 +2221,8 @@ vpif_int_err:
>   */
>  static int vpif_remove(struct platform_device *device)
>  {
> -	struct platform_device *pdev;
>  	struct channel_obj *ch;
> -	struct resource *res;
> -	int irq_num, i = 0;
> -
> -	pdev = container_of(vpif_dev, struct platform_device, dev);
> -	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
> -		for (irq_num = res->start; irq_num <= res->end; irq_num++)
> -			free_irq(irq_num,
> -				 (void *)(&vpif_obj.dev[i]->channel_id));
> -		i++;
> -	}
> +	int i;
> 
>  	v4l2_device_unregister(&vpif_obj.v4l2_dev);
-- 
Regards,

Laurent Pinchart

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