* [RESEND PATCH] staging: media: omap4iss: Fix lines ending with "("
@ 2019-10-12 0:58 Jamal Shareef
2019-10-12 5:36 ` [Outreachy kernel] " Julia Lawall
0 siblings, 1 reply; 2+ messages in thread
From: Jamal Shareef @ 2019-10-12 0:58 UTC (permalink / raw)
To: boqun.feng, andrea.parri
Cc: Jamal Shareef, laurent.pinchart, mchehab, gregkh, outreachy-kernel
Fix lines ending with open left parenthesis "(".
Issue found by checkpatch.
Also fix checkpatch "alignment should match open
parenthesis" issue.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
drivers/staging/media/omap4iss/iss.c | 65 +++++++++++++++++-----------
1 file changed, 40 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 1a966cb2f3a6..9d6676b4618a 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -559,9 +559,11 @@ 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 +585,11 @@ 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 +599,11 @@ 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;
@@ -964,7 +970,9 @@ 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 +1116,40 @@ 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.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [RESEND PATCH] staging: media: omap4iss: Fix lines ending with "("
2019-10-12 0:58 [RESEND PATCH] staging: media: omap4iss: Fix lines ending with "(" Jamal Shareef
@ 2019-10-12 5:36 ` Julia Lawall
0 siblings, 0 replies; 2+ messages in thread
From: Julia Lawall @ 2019-10-12 5:36 UTC (permalink / raw)
To: Jamal Shareef
Cc: boqun.feng, andrea.parri, laurent.pinchart, mchehab, gregkh,
outreachy-kernel
On Fri, 11 Oct 2019, Jamal Shareef wrote:
> Fix lines ending with open left parenthesis "(".
> Issue found by checkpatch.
This looks better as a patch, but the resulting code does not look so
nice. Could you introduce a new local variable and pull out the calls to
iss_reg_read?
julia
>
> Also fix checkpatch "alignment should match open
> parenthesis" issue.
>
> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> ---
> drivers/staging/media/omap4iss/iss.c | 65 +++++++++++++++++-----------
> 1 file changed, 40 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
> index 1a966cb2f3a6..9d6676b4618a 100644
> --- a/drivers/staging/media/omap4iss/iss.c
> +++ b/drivers/staging/media/omap4iss/iss.c
> @@ -559,9 +559,11 @@ 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 +585,11 @@ 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 +599,11 @@ 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;
> @@ -964,7 +970,9 @@ 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 +1116,40 @@ 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.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 outreachy-kernel+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191012005810.4459-1-jamal.k.shareef%40gmail.com.
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-12 5:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-12 0:58 [RESEND PATCH] staging: media: omap4iss: Fix lines ending with "(" Jamal Shareef
2019-10-12 5:36 ` [Outreachy kernel] " Julia Lawall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.