staging: atomisp: remove enable_isp_irq function and add disable_isp_irq

Enable/Disable ISP irq is switched with "enable" parameter of
enable_isp_irq(). It would be better splited to two such as
enable_isp_irq()/disable_isp_irq().

But the enable_isp_irq() is no use in atomisp_cmd.c file.
So remove the enable_isp_irq() function and add
disable_isp_irq function only.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
index 9ad5146931635b02251fd8b237b6b979403f57e8..08606cb668f3c6acb0e2b96ddae25bf4d4244536 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
@@ -376,34 +376,16 @@ int atomisp_reset(struct atomisp_device *isp)
 }
 
 /*
- * interrupt enable/disable functions
+ * interrupt disable functions
  */
-static void enable_isp_irq(enum hrt_isp_css_irq irq, bool enable)
-{
-       if (enable) {
-               irq_enable_channel(IRQ0_ID, irq);
-               /*sh_css_hrt_irq_enable(irq, true, false);*/
-               switch (irq) { /*We only have sp interrupt right now*/
-               case hrt_isp_css_irq_sp:
-                       /*sh_css_hrt_irq_enable_sp(true);*/
-                       cnd_sp_irq_enable(SP0_ID, true);
-                       break;
-               default:
-                       break;
-               }
+static void disable_isp_irq(enum hrt_isp_css_irq irq)
+{
+       irq_disable_channel(IRQ0_ID, irq);
 
-       } else {
-               /*sh_css_hrt_irq_disable(irq);*/
-               irq_disable_channel(IRQ0_ID, irq);
-               switch (irq) {
-               case hrt_isp_css_irq_sp:
-                       /*sh_css_hrt_irq_enable_sp(false);*/
-                       cnd_sp_irq_enable(SP0_ID, false);
-                       break;
-               default:
-                       break;
-               }
-       }
+       if (irq != hrt_isp_css_irq_sp)
+               return;
+
+       cnd_sp_irq_enable(SP0_ID, false);
 }
 
 /*
@@ -1416,7 +1398,7 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout)
        }
 
        /* clear irq */
-       enable_isp_irq(hrt_isp_css_irq_sp, false);
+       disable_isp_irq(hrt_isp_css_irq_sp);
        clear_isp_irq(hrt_isp_css_irq_sp);
 
        /* Set the SRSE to 3 before resetting */