aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/staging
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-05-20 08:46:17 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-05-20 15:02:58 +0200
commit58d6ccc264ed527377434e53ffadfdebed6cf915 (patch)
tree4d6dc8c39aa934f280bb930873e99ac3b1a2b5bb /drivers/staging
parentmedia: atomisp: print IRQ when debugging (diff)
downloadwireguard-linux-58d6ccc264ed527377434e53ffadfdebed6cf915.tar.xz
wireguard-linux-58d6ccc264ed527377434e53ffadfdebed6cf915.zip
media: atomisp: don't produce errs for ignored IRQs
Depending on the ISP-specific HAS_NO_INPUT_FORMATTER macro, some IRQs will be ignored by the driver. Yet, those keep happening, as reported by this debug print: [ 61.620746] atomisp-isp2 0000:00:03.0: atomisp_css_irq_enable: css irq info 0x00000004: disable. Causing this warning: [ 61.620749] atomisp-isp2 0000:00:03.0: atomisp_css_irq_enable:Invalid irq info. Well, if this is a normal situation, just ignore it without warnings. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/atomisp/pci/sh_css.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index af77fb57282f..05b3565ed5a3 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -2660,11 +2660,16 @@ enum ia_css_err ia_css_irq_enable(
case IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR:
irq = virq_isys_csi;
break;
-#endif
-#if !defined(HAS_NO_INPUT_FORMATTER)
case IA_CSS_IRQ_INFO_IF_ERROR:
irq = virq_ifmt0_id;
break;
+#else
+ case IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF:
+ case IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF:
+ case IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR:
+ case IA_CSS_IRQ_INFO_IF_ERROR:
+ /* Just ignore those unused IRQs without printing errors */
+ return IA_CSS_SUCCESS;
#endif
case IA_CSS_IRQ_INFO_DMA_ERROR:
irq = virq_dma;