p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] v4l: omap4iss: Make omap4iss_isp_subclk_(en|dis)able() functions void 

The functions always succeed, there's no need to return an error value.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2013-11-03 20:28:24 -03:00 committed by Mauro Carvalho Chehab
parent ca6f19b1cf
commit 68c03a666c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/media/omap4iss/iss.c
View File

@ -836,7 +836,7 @@ int omap4iss_subclk_disable(struct iss_device *iss,
ISP5_CTRL_IPIPE_CLK_ENABLE |\
ISP5_CTRL_IPIPEIF_CLK_ENABLE)
static int __iss_isp_subclk_update(struct iss_device *iss)
static void __iss_isp_subclk_update(struct iss_device *iss)
{
u32 clk = 0;
@ -861,24 +861,22 @@ static int __iss_isp_subclk_update(struct iss_device *iss)
writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL) &
~ISS_ISP5_CLKCTRL_MASK) | clk,
iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL);
return 0;
}
int omap4iss_isp_subclk_enable(struct iss_device *iss,
void omap4iss_isp_subclk_enable(struct iss_device *iss,
enum iss_isp_subclk_resource res)
{
iss->isp_subclk_resources |= res;
return __iss_isp_subclk_update(iss);
__iss_isp_subclk_update(iss);
}
int omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res)
void omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res)
{
iss->isp_subclk_resources &= ~res;
return __iss_isp_subclk_update(iss);
__iss_isp_subclk_update(iss);
}
/*

6
drivers/staging/media/omap4iss/iss.h
View File

@ -136,10 +136,10 @@ int omap4iss_subclk_enable(struct iss_device *iss,
enum iss_subclk_resource res);
int omap4iss_subclk_disable(struct iss_device *iss,
enum iss_subclk_resource res);
int omap4iss_isp_subclk_enable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
int omap4iss_isp_subclk_disable(struct iss_device *iss,
void omap4iss_isp_subclk_enable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
void omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
void omap4iss_isp_enable_interrupts(struct iss_device *iss);
void omap4iss_isp_disable_interrupts(struct iss_device *iss);