[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>

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 3103093..043a3f3 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -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);
 }
 
 /*

diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index cc24f1a..f33664d 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -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);