Bladeren bron

[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>
Michael Opdenacker 12 jaren geleden
bovenliggende
commit
d8c279a00b
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 1
      drivers/media/platform/davinci/vpbe_display.c
  2. 2 2
      drivers/media/platform/davinci/vpfe_capture.c

+ 1 - 1
drivers/media/platform/davinci/vpbe_display.c

@@ -1785,7 +1785,7 @@ static int vpbe_display_probe(struct platform_device *pdev)
 	}
 	}
 
 
 	irq = res->start;
 	irq = res->start;
-	err = devm_request_irq(&pdev->dev, irq, venc_isr, IRQF_DISABLED,
+	err = devm_request_irq(&pdev->dev, irq, venc_isr, 0,
 			       VPBE_DISPLAY_DRIVER, disp_dev);
 			       VPBE_DISPLAY_DRIVER, disp_dev);
 	if (err) {
 	if (err) {
 		v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,
 		v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,

+ 2 - 2
drivers/media/platform/davinci/vpfe_capture.c

@@ -688,7 +688,7 @@ static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)
 	frame_format = ccdc_dev->hw_ops.get_frame_format();
 	frame_format = ccdc_dev->hw_ops.get_frame_format();
 	if (frame_format == CCDC_FRMFMT_PROGRESSIVE) {
 	if (frame_format == CCDC_FRMFMT_PROGRESSIVE) {
 		return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr,
 		return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr,
-				    IRQF_DISABLED, "vpfe_capture1",
+				    0, "vpfe_capture1",
 				    vpfe_dev);
 				    vpfe_dev);
 	}
 	}
 	return 0;
 	return 0;
@@ -1863,7 +1863,7 @@ static int vpfe_probe(struct platform_device *pdev)
 	}
 	}
 	vpfe_dev->ccdc_irq1 = res1->start;
 	vpfe_dev->ccdc_irq1 = res1->start;
 
 
-	ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, IRQF_DISABLED,
+	ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, 0,
 			  "vpfe_capture0", vpfe_dev);
 			  "vpfe_capture0", vpfe_dev);
 
 
 	if (0 != ret) {
 	if (0 != ret) {