Skip to contentSkip to conversation

staging: media: imx: Fixed depricated implementations of 80 char limit & open parentheses line ending

PATCH Applied Raiden Horner 2 participants 2 messages Oct 6 – Nov 4

Subsystems (4)
Media (V4L/DVB) Arm i.MX and Layerscape Staging Media drivers for Freescale i.MX
lore
Share & tools
lore

Raiden Horner

author
#0 lore raw

PATCH v2 1/1 staging: media: imx: Fixed depricated implementations of 80 char limit & open parentheses line ending

Fixed open parentheses line ending issues & readability.

I presume this syntax was there to meet the old 80 char limit, and double checked the changelogs to make sure this was not already submitted.

If not I apologize, I am still getting used to using the indexing system.

Signed-off-by Raiden Horner <[email protected]>

---
Changes in v2:
- Fixed line wrapping in the commit message to adhere to 75 columns

 drivers/staging/media/imx/imx-ic-prpencvf.c   | 13 +++--
 drivers/staging/media/imx/imx-media-csi.c     |  4 +-
 .../staging/media/imx/imx-media-dev-common.c  |  2 +-
 drivers/staging/media/imx/imx-media-fim.c     |  5 +-
 drivers/staging/media/imx/imx-media-utils.c   | 54 +++++--------------
 5 files changed, 24 insertions(+), 54 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +6 -7
index 77360bfe081a..69f5ca280454 100644
@@ -704,11 +704,11 @@ static int prp_start(struct prp_priv *priv)
 	}
 
 	if (ipu_rot_mode_is_irt(priv->rot_mode))
-		priv->eof_irq = ipu_idmac_channel_irq(
-			ic_priv->ipu, priv->rot_out_ch, IPU_IRQ_EOF);
+		priv->eof_irq = ipu_idmac_channel_irq(ic_priv->ipu,
+						      priv->rot_out_ch, IPU_IRQ_EOF);
 	else
-		priv->eof_irq = ipu_idmac_channel_irq(
-			ic_priv->ipu, priv->out_ch, IPU_IRQ_EOF);
+		priv->eof_irq = ipu_idmac_channel_irq(ic_priv->ipu,
+						      priv->out_ch, IPU_IRQ_EOF);
 
 	ret = devm_request_irq(ic_priv->ipu_dev, priv->eof_irq,
 			       prp_eof_interrupt, 0,

@@ -761,9 +761,8 @@ static void prp_stop(struct prp_priv *priv)
 	/*
 	 * and then wait for interrupt handler to mark completion.
 	 */
-	ret = wait_for_completion_timeout(
-		&priv->last_eof_comp,
-		msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
+	ret = wait_for_completion_timeout(&priv->last_eof_comp,
+					  msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
 	if (ret == 0)
 		v4l2_warn(&ic_priv->sd, "wait last EOF timeout\n");
drivers/staging/media/imx/imx-media-csi.c +2 -2
index ef22a083f8eb..4eb621ddda25 100644
@@ -679,8 +679,8 @@ static void csi_idmac_wait_last_eof(struct csi_priv *priv)
 	/*
 	 * and then wait for interrupt handler to mark completion.
 	 */
-	ret = wait_for_completion_timeout(
-		&priv->last_eof_comp, msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
+	ret = wait_for_completion_timeout(&priv->last_eof_comp,
+					  msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
 	if (ret == 0)
 		v4l2_warn(&priv->sd, "wait last EOF timeout\n");
 }
drivers/staging/media/imx/imx-media-dev-common.c +1 -1
index 0d0ee8627a2d..be445df93518 100644
@@ -377,7 +377,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev,
 EXPORT_SYMBOL_GPL(imx_media_dev_init);
 
 int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,
-			    const struct v4l2_async_notifier_operations *ops)
+				    const struct v4l2_async_notifier_operations *ops)
 {
 	int ret;
drivers/staging/media/imx/imx-media-fim.c +2 -3
index ccbc0371fba2..9e9bacf9dcec 100644
@@ -205,9 +205,8 @@ static void fim_acquire_first_ts(struct imx_media_fim *fim)
 	if (!fim->enabled || fim->num_skip > 0)
 		return;
 
-	ret = wait_for_completion_timeout(
-		&fim->icap_first_event,
-		msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
+	ret = wait_for_completion_timeout(&fim->icap_first_event,
+					  msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
 	if (ret == 0)
 		v4l2_warn(fim->sd, "wait first icap event timeout\n");
 }
drivers/staging/media/imx/imx-media-utils.c +13 -41

96 lines not on this page · raw message

Signature · 1 line
2.47.3
Applied
#1 lore raw

From: Frank Li <[email protected]>

Quoted 8 lines · Raiden Horner

Fixed open parentheses line ending issues & readability.

I presume this syntax was there to meet the old 80 char limit, and double checked the changelogs to make sure this was not already submitted.

If not I apologize, I am still getting used to using the indexing system.

Update commit message as

staging: media: imx: clean up line wrapping

Remove obsolete line breaks and adjust parenthesis placement to follow current kernel coding style and improve readability.

No functional change.

Quoted 2 lines

[...]

Applied, thanks!

[1/1] staging: media: imx: Fixed depricated implementations of 80 char limit & open parentheses line ending

      commit: 2fb3c87215703f8513c285f15d3158ae2e93c987

Best regards,
--
Frank Li <[email protected]>