staging: media: omap4iss: Fix lines ending with open parenthesis
Subsystems (2)
PATCH v4 1/1 staging: media: omap4iss: Fix lines ending with open parenthesis
Fix lines ending with open parenthesis. Issue
found by checkpatch.
Signed-off-by Jamal Shareef <[email protected]>
---
Changes in v4:
- Leave parenthsis open and adjust spacing for iss_poll_condition call for better readability.
Changes in v3:
- Remove created local variables and revert back to original function calls because intent is to dynamically poll the value.
- Format code for better readability. This introduces new warning for "alignment should match open parenthesis" but will be disregarded.
Changes in v2:
- Include similar changes in iss.c file.
- Create local variables for iss_reg_read
function calls for better code formatting.
--- drivers/staging/media/omap4iss/iss.c | 44 +++++++++++++---------- drivers/staging/media/omap4iss/iss_csi2.c | 6 ++-- 2 files changed, 30 insertions(+), 20 deletions(-)
drivers/staging/media/omap4iss/iss.c +26 -18
@@ -561,7 +561,8 @@ static int iss_reset(struct iss_device *iss) timeout =iss_poll_condition_timeout ( !(iss_reg_read (iss,OMAP4_ISS_MEM_TOP ,ISS_HL_SYSCONFIG ) & -ISS_HL_SYSCONFIG_SOFTRESET ),1000 ,10 ,100 ); +ISS_HL_SYSCONFIG_SOFTRESET ), +1000 ,10 ,100 );if (timeout) {dev_err (iss->dev,"ISS reset timeout\n" );return -ETIMEDOUT ;
@@ -585,7 +586,8 @@ static int iss_isp_reset(struct iss_device *iss) timeout =iss_poll_condition_timeout (iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 ,ISP5_CTRL ) & -ISP5_CTRL_MSTANDBY_WAIT ,1000000 ,1000 ,1500 ); +ISP5_CTRL_MSTANDBY_WAIT , +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 standby timeout\n" );return -ETIMEDOUT ;
@@ -597,7 +599,8 @@ static int iss_isp_reset(struct iss_device *iss) timeout =iss_poll_condition_timeout ( !(iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 ,ISP5_SYSCONFIG ) & -ISP5_SYSCONFIG_SOFTRESET ),1000000 ,1000 ,1500 ); +ISP5_SYSCONFIG_SOFTRESET ), +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 reset timeout\n" );return -ETIMEDOUT ;
@@ -1108,33 +1111,38 @@ 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;
drivers/staging/media/omap4iss/iss_csi2.c +4 -2
@@ -497,7 +497,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2) timeout =iss_poll_condition_timeout (iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ) & -CSI2_SYSSTATUS_RESET_DONE ,500 ,100 ,200 ); +CSI2_SYSSTATUS_RESET_DONE , +500 ,100 ,200 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: Soft reset timeout!\n" );return -EBUSY ;
@@ -508,7 +509,8 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2) timeout =iss_poll_condition_timeout (iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 ) & -REGISTER1_RESET_DONE_CTRLCLK ,10000 ,100 ,500 ); +REGISTER1_RESET_DONE_CTRLCLK , +10000 ,100 ,500 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: CSI2_96M_FCLK reset timeout!\n" );return -EBUSY ;
Signature · 1 line
2.17.1