hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daeseok Youn 2017-04-12 19:20:22 +01:00 committed by Greg Kroah-Hartman
parent 31991c8cbf
commit 287666dfe8
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
View File

@ -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) static void disable_isp_irq(enum hrt_isp_css_irq irq)
{ {
if (enable) { irq_disable_channel(IRQ0_ID, irq);
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;
}
} else { if (irq != hrt_isp_css_irq_sp)
/*sh_css_hrt_irq_disable(irq);*/ return;
irq_disable_channel(IRQ0_ID, irq);
switch (irq) { cnd_sp_irq_enable(SP0_ID, false);
case hrt_isp_css_irq_sp:
/*sh_css_hrt_irq_enable_sp(false);*/
cnd_sp_irq_enable(SP0_ID, false);
break;
default:
break;
}
}
} }
/* /*
@ -1416,7 +1398,7 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout)
} }
/* clear irq */ /* 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); clear_isp_irq(hrt_isp_css_irq_sp);
/* Set the SRSE to 3 before resetting */ /* Set the SRSE to 3 before resetting */