diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-08 22:30:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-10-03 13:11:18 -0400 |
commit | d8c279a00ba42f7face4bbf959c31d24e5e5baa4 (patch) | |
tree | beeb7abe8c24d0065c9be6fd899fcdfc3f90d425 | |
parent | 66bf8fa2aca2ec215ce3f5bb0fdffe1a79192b57 (diff) |
[media] davinci: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from
davinci media platform drivers.
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 04609cc6eba7..eac472b5ae83 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c | |||
@@ -1785,7 +1785,7 @@ static int vpbe_display_probe(struct platform_device *pdev) | |||
1785 | } | 1785 | } |
1786 | 1786 | ||
1787 | irq = res->start; | 1787 | irq = res->start; |
1788 | err = devm_request_irq(&pdev->dev, irq, venc_isr, IRQF_DISABLED, | 1788 | err = devm_request_irq(&pdev->dev, irq, venc_isr, 0, |
1789 | VPBE_DISPLAY_DRIVER, disp_dev); | 1789 | VPBE_DISPLAY_DRIVER, disp_dev); |
1790 | if (err) { | 1790 | if (err) { |
1791 | v4l2_err(&disp_dev->vpbe_dev->v4l2_dev, | 1791 | v4l2_err(&disp_dev->vpbe_dev->v4l2_dev, |
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 93609091cb23..d762246eabf5 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c | |||
@@ -688,7 +688,7 @@ static int vpfe_attach_irq(struct vpfe_device *vpfe_dev) | |||
688 | frame_format = ccdc_dev->hw_ops.get_frame_format(); | 688 | frame_format = ccdc_dev->hw_ops.get_frame_format(); |
689 | if (frame_format == CCDC_FRMFMT_PROGRESSIVE) { | 689 | if (frame_format == CCDC_FRMFMT_PROGRESSIVE) { |
690 | return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr, | 690 | return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr, |
691 | IRQF_DISABLED, "vpfe_capture1", | 691 | 0, "vpfe_capture1", |
692 | vpfe_dev); | 692 | vpfe_dev); |
693 | } | 693 | } |
694 | return 0; | 694 | return 0; |
@@ -1863,7 +1863,7 @@ static int vpfe_probe(struct platform_device *pdev) | |||
1863 | } | 1863 | } |
1864 | vpfe_dev->ccdc_irq1 = res1->start; | 1864 | vpfe_dev->ccdc_irq1 = res1->start; |
1865 | 1865 | ||
1866 | ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, IRQF_DISABLED, | 1866 | ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, 0, |
1867 | "vpfe_capture0", vpfe_dev); | 1867 | "vpfe_capture0", vpfe_dev); |
1868 | 1868 | ||
1869 | if (0 != ret) { | 1869 | if (0 != ret) { |