From: Prabhakar Lad <prabhakar.csengg@gmail.com>
To: Hans Verkuil <hans.verkuil@cisco.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
LMML <linux-media@vger.kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: DLOS <davinci-linux-open-source@linux.davincidsp.com>,
LKML <linux-kernel@vger.kernel.org>,
"Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Subject: [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api
Date: Sun, 26 May 2013 17:30:09 +0530 [thread overview]
Message-ID: <1369569612-30915-7-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1369569612-30915-1-git-send-email-prabhakar.csengg@gmail.com>
From: Lad, Prabhakar <prabhakar.csengg@gmail.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@gmail.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);
--
1.7.0.4
next prev parent reply other threads:[~2013-05-26 12:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 1/9] media: davinci: vpif: remove unwanted header mach/hardware.h and sort the includes alphabetically Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api Prabhakar Lad
2013-05-26 14:37 ` Sergei Shtylyov
2013-05-26 12:00 ` [PATCH v3 3/9] media: davinci: vpif: remove unnecessary braces around defines Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove() Prabhakar Lad
2013-05-26 14:47 ` Sergei Shtylyov
2013-05-29 2:32 ` Laurent Pinchart
2013-05-29 4:14 ` Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver() Prabhakar Lad
2013-05-29 3:34 ` Laurent Pinchart
2013-05-26 12:00 ` Prabhakar Lad [this message]
2013-05-29 3:37 ` [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 7/9] media: davinci: vpif_display: move the freeing of irq and global variables to remove() Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver() Prabhakar Lad
2013-05-29 3:34 ` Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api Prabhakar Lad
2013-05-29 3:38 ` Laurent Pinchart
2013-05-29 4:15 ` Prabhakar Lad
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369569612-30915-7-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=davinci-linux-open-source@linux.davincidsp.com \
--cc=hans.verkuil@cisco.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®