openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: davinci: vpif_display: Convert to devm_* api 

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>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-06-17 11:20:50 -03:00 committed by Mauro Carvalho Chehab
parent b8d067b601
commit 9c63e01e2b
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/media/platform/davinci/vpif_display.c
View File

@ -1652,15 +1652,14 @@ static __init int vpif_probe(struct platform_device *pdev)
while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) { while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
for (i = res->start; i <= res->end; i++) { for (i = res->start; i <= res->end; i++) {
if (request_irq(i, vpif_channel_isr, IRQF_SHARED, err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
"VPIF_Display", (void *) IRQF_SHARED, "VPIF_Display",
(&vpif_obj.dev[res_idx]->channel_id))) { (void *)(&vpif_obj.dev[res_idx]->
err = -EBUSY; channel_id));
for (j = 0; j < i; j++) if (err) {
free_irq(j, (void *) err = -EINVAL;
(&vpif_obj.dev[res_idx]->channel_id));
vpif_err("VPIF IRQ request failed\n"); vpif_err("VPIF IRQ request failed\n");
goto vpif_int_err; goto vpif_unregister;
} }
} }
res_idx++; res_idx++;
@ -1678,7 +1677,7 @@ static __init int vpif_probe(struct platform_device *pdev)
video_device_release(ch->video_dev); video_device_release(ch->video_dev);
} }
err = -ENOMEM; err = -ENOMEM;
goto vpif_int_err; goto vpif_unregister;
} }
/* Initialize field of video device */ /* Initialize field of video device */
@ -1812,13 +1811,8 @@ static __init int vpif_probe(struct platform_device *pdev)
/* Note: does nothing if ch->video_dev == NULL */ /* Note: does nothing if ch->video_dev == NULL */
video_device_release(ch->video_dev); video_device_release(ch->video_dev);
} }
vpif_int_err: vpif_unregister:
v4l2_device_unregister(&vpif_obj.v4l2_dev); 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; return err;
} }
@ -1829,16 +1823,7 @@ static __init int vpif_probe(struct platform_device *pdev)
static int vpif_remove(struct platform_device *device) static int vpif_remove(struct platform_device *device)
{ {
struct channel_obj *ch; struct channel_obj *ch;
struct resource *res; int i;
int irq_num;
int i = 0;
while ((res = platform_get_resource(device, 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++;
}
v4l2_device_unregister(&vpif_obj.v4l2_dev); v4l2_device_unregister(&vpif_obj.v4l2_dev);