staging: media: omap4iss: Fix lines ending with open parenthesis
Subsystems (2)
PATCH v2 1/1 staging: media: omap4iss: Fix lines ending with open parenthesis
Fix lines ending with open parenthesis. Issue
found by checkpatch.
---
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 | 58 +++++++++++++---------- drivers/staging/media/omap4iss/iss_csi2.c | 14 +++--- 2 files changed, 41 insertions(+), 31 deletions(-)
drivers/staging/media/omap4iss/iss.c +33 -25
@@ -555,13 +555,14 @@ static int iss_pipeline_is_last(struct media_entity *me)static int iss_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_TOP ,ISS_HL_SYSCONFIG );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 (!(reg_config &ISS_HL_SYSCONFIG_SOFTRESET ), +1000 ,10 ,100 );if (timeout) {dev_err (iss->dev,"ISS reset timeout\n" );return -ETIMEDOUT ;
@@ -575,6 +576,9 @@ static int iss_reset(struct iss_device *iss)static int iss_isp_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_ctrl =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 ,ISP5_CTRL ); +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 , +ISP5_SYSCONFIG );/* Fist, ensure that the ISP is IDLE (no transactions happening) */ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,
@@ -583,9 +587,9 @@ 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 (reg_ctrl &ISP5_CTRL_MSTANDBY_WAIT , +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 standby timeout\n" );return -ETIMEDOUT ;
@@ -595,9 +599,9 @@ 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 (!(reg_config &ISP5_SYSCONFIG_SOFTRESET ), +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 reset timeout\n" );return -ETIMEDOUT ;
@@ -964,7 +968,8 @@ iss_register_subdev_group(struct iss_device *iss, } subdev =v4l2_i2c_new_subdev_board (&iss->v4l2_dev, adapter, - board_info->board_info,NULL ); + board_info->board_info, +NULL );if (!subdev) {dev_err (iss->dev,"Unable to register subdev %s\n" , board_info->board_info->type);
@@ -1108,33 +1113,36 @@ 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 +8 -6
@@ -485,6 +485,8 @@ static void csi2_irq_status_set(struct iss_csi2_device *csi2, int enable)int omap4iss_csi2_reset (struct iss_csi2_device *csi2) {unsigned int timeout; +u32 reg_status =iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ); +u32 reg_reg1 =iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 );if (!csi2->available)return -ENODEV ;
@@ -495,9 +497,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_SYSCONFIG ,CSI2_SYSCONFIG_SOFT_RESET ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ) & -CSI2_SYSSTATUS_RESET_DONE ,500 ,100 ,200 ); + timeout = +iss_poll_condition_timeout (reg_status &CSI2_SYSSTATUS_RESET_DONE , +500 ,100 ,200 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: Soft reset timeout!\n" );return -EBUSY ;
@@ -506,9 +508,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_COMPLEXIO_CFG ,CSI2_COMPLEXIO_CFG_RESET_CTRL ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 ) & -REGISTER1_RESET_DONE_CTRLCLK ,10000 ,100 ,500 ); + timeout = +iss_poll_condition_timeout (reg_reg1 ®ISTER1_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
Quoted 9 lines · Jamal Shareef
Fix lines ending with open parenthesis. Issue
found by checkpatch.Signed-off-by Jamal Shareef <[email protected]>---
Changes in v2:
- Include similar changes iniss.cfile.
- Create local variables foriss_reg_read
function calls for better code formatting.
The second point is a change in the code. It should have been mentioned above the --- as well.
julia
Quoted 172 lines
--- drivers/staging/media/omap4iss/iss.c | 58 +++++++++++++---------- drivers/staging/media/omap4iss/iss_csi2.c | 14 +++--- 2 files changed, 41 insertions(+), 31 deletions(-)drivers/staging/media/omap4iss/iss.c +33
-25@@ -555,13 +555,14 @@ static int iss_pipeline_is_last(struct media_entity *me)static int iss_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_TOP ,ISS_HL_SYSCONFIG );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 (!(reg_config &ISS_HL_SYSCONFIG_SOFTRESET ), +1000 ,10 ,100 );if (timeout) {dev_err (iss->dev,"ISS reset timeout\n" );return -ETIMEDOUT ;@@ -575,6 +576,9 @@ static int iss_reset(struct iss_device *iss)static int iss_isp_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_ctrl =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 ,ISP5_CTRL ); +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 , +ISP5_SYSCONFIG );/* Fist, ensure that the ISP is IDLE (no transactions happening) */ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,@@ -583,9 +587,9 @@ 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 (reg_ctrl &ISP5_CTRL_MSTANDBY_WAIT , +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 standby timeout\n" );return -ETIMEDOUT ;@@ -595,9 +599,9 @@ 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 (!(reg_config &ISP5_SYSCONFIG_SOFTRESET ), +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 reset timeout\n" );return -ETIMEDOUT ;@@ -964,7 +968,8 @@ iss_register_subdev_group(struct iss_device *iss, } subdev =v4l2_i2c_new_subdev_board (&iss->v4l2_dev, adapter, - board_info->board_info,NULL ); + board_info->board_info, +NULL );if (!subdev) {dev_err (iss->dev,"Unable to register subdev %s\n" , board_info->board_info->type);@@ -1108,33 +1113,36 @@ 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 +8
-7@@ -485,6 +485,8 @@ static void csi2_irq_status_set(struct iss_csi2_device *csi2, int enable)int omap4iss_csi2_reset (struct iss_csi2_device *csi2) {unsigned int timeout; +u32 reg_status =iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ); +u32 reg_reg1 =iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 );if (!csi2->available)return -ENODEV ;@@ -495,9 +497,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_SYSCONFIG ,CSI2_SYSCONFIG_SOFT_RESET ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ) & -CSI2_SYSSTATUS_RESET_DONE ,500 ,100 ,200 ); + timeout = +iss_poll_condition_timeout (reg_status &CSI2_SYSSTATUS_RESET_DONE , +500 ,100 ,200 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: Soft reset timeout!\n" );return -EBUSY ;@@ -506,9 +508,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_COMPLEXIO_CFG ,CSI2_COMPLEXIO_CFG_RESET_CTRL ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 ) & -REGISTER1_RESET_DONE_CTRLCLK ,10000 ,100 ,500 ); + timeout = +iss_poll_condition_timeout (reg_reg1 ®ISTER1_RESET_DONE_CTRLCLK , +10000 ,100 ,500 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: CSI2_96M_FCLK reset timeout!\n" );return -EBUSY ; --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191012233148.2891-1-jamal.k.shareef%40gmail.com.
Hello Jamal,
Thank you for the patch.
Quoted 11 lines · Julia Lawall
Quoted 9 lines · Jamal Shareef
Fix lines ending with open parenthesis. Issue
found by checkpatch.Signed-off-by Jamal Shareef <[email protected]>---
Changes in v2:
- Include similar changes iniss.cfile.
- Create local variables foriss_reg_read
function calls for better code formatting.
Quoted 2 lines
The second point is a change in the code. It should have been mentioned above the --- as well.
Not only is it a change in the code, but it also breaks it :-) The local variables have a fixed value, while the conditions were being evaluated for every iteration of the iss_poll_condition_timeout() macro. I like thc changes in iss_register_subdev_group() and iss_create_links() though.
Quoted 164 lines
Quoted 164 lines
--- drivers/staging/media/omap4iss/iss.c | 58 +++++++++++++---------- drivers/staging/media/omap4iss/iss_csi2.c | 14 +++--- 2 files changed, 41 insertions(+), 31 deletions(-)drivers/staging/media/omap4iss/iss.c +33
-25@@ -555,13 +555,14 @@ static int iss_pipeline_is_last(struct media_entity *me)static int iss_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_TOP ,ISS_HL_SYSCONFIG );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 (!(reg_config &ISS_HL_SYSCONFIG_SOFTRESET ), +1000 ,10 ,100 );if (timeout) {dev_err (iss->dev,"ISS reset timeout\n" );return -ETIMEDOUT ;@@ -575,6 +576,9 @@ static int iss_reset(struct iss_device *iss)static int iss_isp_reset (struct iss_device *iss) {unsigned int timeout; +u32 reg_ctrl =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 ,ISP5_CTRL ); +u32 reg_config =iss_reg_read (iss,OMAP4_ISS_MEM_ISP_SYS1 , +ISP5_SYSCONFIG );/* Fist, ensure that the ISP is IDLE (no transactions happening) */ iss_reg_update(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_SYSCONFIG,@@ -583,9 +587,9 @@ 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 (reg_ctrl &ISP5_CTRL_MSTANDBY_WAIT , +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 standby timeout\n" );return -ETIMEDOUT ;@@ -595,9 +599,9 @@ 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 (!(reg_config &ISP5_SYSCONFIG_SOFTRESET ), +1000000 ,1000 ,1500 );if (timeout) {dev_err (iss->dev,"ISP5 reset timeout\n" );return -ETIMEDOUT ;@@ -964,7 +968,8 @@ iss_register_subdev_group(struct iss_device *iss, } subdev =v4l2_i2c_new_subdev_board (&iss->v4l2_dev, adapter, - board_info->board_info,NULL ); + board_info->board_info, +NULL );if (!subdev) {dev_err (iss->dev,"Unable to register subdev %s\n" , board_info->board_info->type);@@ -1108,33 +1113,36 @@ 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 +8
-6@@ -485,6 +485,8 @@ static void csi2_irq_status_set(struct iss_csi2_device *csi2, int enable)int omap4iss_csi2_reset (struct iss_csi2_device *csi2) {unsigned int timeout; +u32 reg_status =iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ); +u32 reg_reg1 =iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 );if (!csi2->available)return -ENODEV ;@@ -495,9 +497,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_SYSCONFIG ,CSI2_SYSCONFIG_SOFT_RESET ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->regs1,CSI2_SYSSTATUS ) & -CSI2_SYSSTATUS_RESET_DONE ,500 ,100 ,200 ); + timeout = +iss_poll_condition_timeout (reg_status &CSI2_SYSSTATUS_RESET_DONE , +500 ,100 ,200 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: Soft reset timeout!\n" );return -EBUSY ;@@ -506,9 +508,9 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2)iss_reg_set (csi2->iss, csi2->regs1,CSI2_COMPLEXIO_CFG ,CSI2_COMPLEXIO_CFG_RESET_CTRL ); - timeout =iss_poll_condition_timeout ( -iss_reg_read (csi2->iss, csi2->phy->phy_regs,REGISTER1 ) & -REGISTER1_RESET_DONE_CTRLCLK ,10000 ,100 ,500 ); + timeout = +iss_poll_condition_timeout (reg_reg1 ®ISTER1_RESET_DONE_CTRLCLK , +10000 ,100 ,500 );if (timeout) {dev_err (csi2->iss->dev,"CSI2: CSI2_96M_FCLK reset timeout!\n" );return -EBUSY ;
Signature · 3 lines
Regards, Laurent Pinchart