Remove checkpatch check "CHECK: Lines should not end with a '('" with
argument present in next line and reorganize characters so the lines
are under 100 columns

Signed-off-by: Beatriz Martins de Carvalho <[email protected]>
---
 drivers/staging/media/omap4iss/iss.c | 46 +++++++++++++---------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss.c 
b/drivers/staging/media/omap4iss/iss.c
index dae9073e7d3c..e8f724dbf810 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -559,9 +559,10 @@ static int iss_reset(struct iss_device *iss)
        iss_reg_set(iss, OMAP4_ISS_MEM_TOP, ISS_HL_SYSCONFIG,
                    ISS_HL_SYSCONFIG_SOFTRESET);
 
-       timeout = iss_poll_condition_timeout(
-               !(iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_SYSCONFIG) &
-               ISS_HL_SYSCONFIG_SOFTRESET), 1000, 10, 100);
+       timeout = iss_poll_condition_timeout(!(iss_reg_read(iss,
+                                                           OMAP4_ISS_MEM_TOP, 
ISS_HL_SYSCONFIG)
+                                                           & 
ISS_HL_SYSCONFIG_SOFTRESET),
+                                                           1000, 10, 100);
        if (timeout) {
                dev_err(iss->dev, "ISS reset timeout\n");
                return -ETIMEDOUT;
@@ -583,9 +584,10 @@ static int iss_isp_reset(struct iss_device *iss)
 
        iss_reg_set(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL, ISP5_CTRL_MSTANDBY);
 
-       timeout = iss_poll_condition_timeout(
-               iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL) &
-               ISP5_CTRL_MSTANDBY_WAIT, 1000000, 1000, 1500);
+       timeout = iss_poll_condition_timeout(iss_reg_read(iss,
+                                                         
OMAP4_ISS_MEM_ISP_SYS1, ISP5_CTRL)
+                                                         & 
ISP5_CTRL_MSTANDBY_WAIT, 1000000,
+                                                         1000, 1500);
        if (timeout) {
                dev_err(iss->dev, "ISP5 standby timeout\n");
                return -ETIMEDOUT;
@@ -595,9 +597,10 @@ static int iss_isp_reset(struct iss_device *iss)
        iss_reg_set(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,
                    ISP5_SYSCONFIG_SOFTRESET);
 
-       timeout = iss_poll_condition_timeout(
-               !(iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG) &
-               ISP5_SYSCONFIG_SOFTRESET), 1000000, 1000, 1500);
+       timeout = iss_poll_condition_timeout(!(iss_reg_read(iss, 
OMAP4_ISS_MEM_ISP_SYS1,
+                                                           ISP5_SYSCONFIG) &
+                                                           
ISP5_SYSCONFIG_SOFTRESET), 1000000,
+                                                           1000, 1500);
        if (timeout) {
                dev_err(iss->dev, "ISP5 reset timeout\n");
                return -ETIMEDOUT;
@@ -1104,33 +1107,28 @@ static int iss_create_links(struct iss_device *iss)
        }
 
        /* Connect the submodules. */
-       ret = media_create_pad_link(
-                       &iss->csi2a.subdev.entity, CSI2_PAD_SOURCE,
-                       &iss->ipipeif.subdev.entity, IPIPEIF_PAD_SINK, 0);
+       ret = media_create_pad_link(&iss->csi2a.subdev.entity, CSI2_PAD_SOURCE,
+                                   &iss->ipipeif.subdev.entity, 
IPIPEIF_PAD_SINK, 0);
        if (ret < 0)
                return ret;
 
-       ret = media_create_pad_link(
-                       &iss->csi2b.subdev.entity, CSI2_PAD_SOURCE,
-                       &iss->ipipeif.subdev.entity, IPIPEIF_PAD_SINK, 0);
+       ret = media_create_pad_link(&iss->csi2b.subdev.entity, CSI2_PAD_SOURCE,
+                                   &iss->ipipeif.subdev.entity, 
IPIPEIF_PAD_SINK, 0);
        if (ret < 0)
                return ret;
 
-       ret = media_create_pad_link(
-                       &iss->ipipeif.subdev.entity, IPIPEIF_PAD_SOURCE_VP,
-                       &iss->resizer.subdev.entity, RESIZER_PAD_SINK, 0);
+       ret = media_create_pad_link(&iss->ipipeif.subdev.entity, 
IPIPEIF_PAD_SOURCE_VP,
+                                   &iss->resizer.subdev.entity, 
RESIZER_PAD_SINK, 0);
        if (ret < 0)
                return ret;
 
-       ret = media_create_pad_link(
-                       &iss->ipipeif.subdev.entity, IPIPEIF_PAD_SOURCE_VP,
-                       &iss->ipipe.subdev.entity, IPIPE_PAD_SINK, 0);
+       ret = media_create_pad_link(&iss->ipipeif.subdev.entity, 
IPIPEIF_PAD_SOURCE_VP,
+                                   &iss->ipipe.subdev.entity, IPIPE_PAD_SINK, 
0);
        if (ret < 0)
                return ret;
 
-       ret = media_create_pad_link(
-                       &iss->ipipe.subdev.entity, IPIPE_PAD_SOURCE_VP,
-                       &iss->resizer.subdev.entity, RESIZER_PAD_SINK, 0);
+       ret = media_create_pad_link(&iss->ipipe.subdev.entity, 
IPIPE_PAD_SOURCE_VP,
+                                   &iss->resizer.subdev.entity, 
RESIZER_PAD_SINK, 0);
        if (ret < 0)
                return ret;
 
-- 
2.25.1

Reply via email to