Commit 68c03a66 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ca6f19b1
...@@ -836,7 +836,7 @@ int omap4iss_subclk_disable(struct iss_device *iss, ...@@ -836,7 +836,7 @@ int omap4iss_subclk_disable(struct iss_device *iss,
ISP5_CTRL_IPIPE_CLK_ENABLE |\ ISP5_CTRL_IPIPE_CLK_ENABLE |\
ISP5_CTRL_IPIPEIF_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; u32 clk = 0;
...@@ -861,24 +861,22 @@ static int __iss_isp_subclk_update(struct iss_device *iss) ...@@ -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) & writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL) &
~ISS_ISP5_CLKCTRL_MASK) | clk, ~ISS_ISP5_CLKCTRL_MASK) | clk,
iss->regs[OMAP4_ISS_MEM_ISP_SYS1] + ISP5_CTRL); 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) enum iss_isp_subclk_resource res)
{ {
iss->isp_subclk_resources |= 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, void omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res) enum iss_isp_subclk_resource res)
{ {
iss->isp_subclk_resources &= ~res; iss->isp_subclk_resources &= ~res;
return __iss_isp_subclk_update(iss); __iss_isp_subclk_update(iss);
} }
/* /*
......
...@@ -136,10 +136,10 @@ int omap4iss_subclk_enable(struct iss_device *iss, ...@@ -136,10 +136,10 @@ int omap4iss_subclk_enable(struct iss_device *iss,
enum iss_subclk_resource res); enum iss_subclk_resource res);
int omap4iss_subclk_disable(struct iss_device *iss, int omap4iss_subclk_disable(struct iss_device *iss,
enum iss_subclk_resource res); enum iss_subclk_resource res);
int omap4iss_isp_subclk_enable(struct iss_device *iss, void omap4iss_isp_subclk_enable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
int omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res); 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_enable_interrupts(struct iss_device *iss);
void omap4iss_isp_disable_interrupts(struct iss_device *iss); void omap4iss_isp_disable_interrupts(struct iss_device *iss);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment