mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "André Apitzsch via B4 Relay" <devnull+git.apitzsch.eu@kernel.org>
To: Ricardo Ribalda <ribalda@kernel.org>,
	 Sakari Ailus <sakari.ailus@linux.intel.com>,
	 Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: ~postmarketos/upstreaming@lists.sr.ht,
	phone-devel@vger.kernel.org, linux-media@vger.kernel.org,
	linux-kernel@vger.kernel.org, "André Apitzsch" <git@apitzsch.eu>
Subject: [PATCH 02/13] media: i2c: imx214: Remove unneeded goto
Date: Mon, 02 Sep 2024 23:54:29 +0200	[thread overview]
Message-ID: <20240902-imx214-v1-2-c96cba989315@apitzsch.eu> (raw)
In-Reply-To: <20240902-imx214-v1-0-c96cba989315@apitzsch.eu>

From: André Apitzsch <git@apitzsch.eu>

Simplify the imx214_start_streaming() by removing unneeded goto
statements, and the corresponding error label.

Signed-off-by: André Apitzsch <git@apitzsch.eu>
---
 drivers/media/i2c/imx214.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c
index 58f3c3f67e0d..283d4783c22e 100644
--- a/drivers/media/i2c/imx214.c
+++ b/drivers/media/i2c/imx214.c
@@ -776,7 +776,7 @@ static int imx214_start_streaming(struct imx214 *imx214)
 	ret = imx214_write_table(imx214, mode_table_common);
 	if (ret < 0) {
 		dev_err(imx214->dev, "could not sent common table %d\n", ret);
-		goto error;
+		return ret;
 	}
 
 	mode = v4l2_find_nearest_size(imx214_modes,
@@ -785,22 +785,17 @@ static int imx214_start_streaming(struct imx214 *imx214)
 	ret = imx214_write_table(imx214, mode->reg_table);
 	if (ret < 0) {
 		dev_err(imx214->dev, "could not sent mode table %d\n", ret);
-		goto error;
+		return ret;
 	}
 	ret = __v4l2_ctrl_handler_setup(&imx214->ctrls);
 	if (ret < 0) {
 		dev_err(imx214->dev, "could not sync v4l2 controls\n");
-		goto error;
+		return ret;
 	}
 	ret = regmap_write(imx214->regmap, IMX214_REG_MODE_SELECT, IMX214_MODE_STREAMING);
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(imx214->dev, "could not sent start table %d\n", ret);
-		goto error;
-	}
-
-	return 0;
 
-error:
 	return ret;
 }
 

-- 
2.46.0



  parent reply	other threads:[~2024-09-02 21:53 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-02 21:54 [PATCH 00/13] media: i2c: imx214: Miscellaneous cleanups and improvements André Apitzsch via B4 Relay
2024-09-02 21:54 ` [PATCH 01/13] media: i2c: imx214: Use subdev active state André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` André Apitzsch via B4 Relay [this message]
2024-09-12 13:40   ` [PATCH 02/13] media: i2c: imx214: Remove unneeded goto Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 03/13] media: i2c: imx214: Simplify with dev_err_probe() André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 04/13] media: i2c: imx214: Convert to CCI register access helpers André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 05/13] media: i2c: imx214: Replace register addresses with macros André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 06/13] media: i2c: imx214: Drop IMX214_REG_EXPOSURE from mode reg arrays André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 07/13] media: i2c: imx214: Use number of lanes from device tree André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 08/13] media: i2c: imx214: Add vblank and hblank controls André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-12 14:51     ` Dave Stevenson
2024-09-13 17:40       ` Dave Stevenson
2024-10-06 21:41         ` André
2024-10-07 17:29           ` Dave Stevenson
2024-10-12 21:45             ` André Apitzsch
2024-10-14 12:17               ` Dave Stevenson
2024-09-02 21:54 ` [PATCH 09/13] media: i2c: imx214: Extract format and crop settings André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-10-06 21:28     ` André
2024-09-02 21:54 ` [PATCH 10/13] media: i2c: imx214: Implement vflip/hflip controls André Apitzsch via B4 Relay
2024-09-12 13:40   ` Ricardo Ribalda Delgado
2024-09-12 15:16   ` Dave Stevenson
2024-09-02 21:54 ` [PATCH 11/13] media: i2c: imx214: Add analogue/digital gain control André Apitzsch via B4 Relay
2024-09-12 13:39   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 12/13] media: i2c: imx214: Verify chip ID André Apitzsch via B4 Relay
2024-09-12 13:39   ` Ricardo Ribalda Delgado
2024-09-02 21:54 ` [PATCH 13/13] media: i2c: imx214: Add test pattern control André Apitzsch via B4 Relay
2024-09-12 13:39   ` Ricardo Ribalda Delgado

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240902-imx214-v1-2-c96cba989315@apitzsch.eu \
    --to=devnull+git.apitzsch.eu@kernel.org \
    --cc=git@apitzsch.eu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=phone-devel@vger.kernel.org \
    --cc=ribalda@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=~postmarketos/upstreaming@lists.sr.ht \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®