mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	linux-media <linux-media@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] media: i2c: ov8865: Neaten unnecessary indentation
Date: Thu, 02 Dec 2021 01:06:01 -0800	[thread overview]
Message-ID: <c6189daaac183ddf51da1444c597d8577c1ac416.camel@perches.com> (raw)

Jumping to the start of a labeled else block isn't typical.

Unindent the code by reversing the test and using a goto instead.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/media/i2c/ov8865.c | 81 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c
index ebdb20d3fe9d8..7ef83a10f586f 100644
--- a/drivers/media/i2c/ov8865.c
+++ b/drivers/media/i2c/ov8865.c
@@ -2396,56 +2396,57 @@ static int ov8865_sensor_init(struct ov8865_sensor *sensor)
 
 static int ov8865_sensor_power(struct ov8865_sensor *sensor, bool on)
 {
-	/* Keep initialized to zero for disable label. */
-	int ret = 0;
+	int ret;
 
-	if (on) {
-		gpiod_set_value_cansleep(sensor->reset, 1);
-		gpiod_set_value_cansleep(sensor->powerdown, 1);
+	if (!on) {
+		ret = 0;
+		goto disable;
+	}
 
-		ret = regulator_enable(sensor->dovdd);
-		if (ret) {
-			dev_err(sensor->dev,
-				"failed to enable DOVDD regulator\n");
-			goto disable;
-		}
+	gpiod_set_value_cansleep(sensor->reset, 1);
+	gpiod_set_value_cansleep(sensor->powerdown, 1);
 
-		ret = regulator_enable(sensor->avdd);
-		if (ret) {
-			dev_err(sensor->dev,
-				"failed to enable AVDD regulator\n");
-			goto disable;
-		}
+	ret = regulator_enable(sensor->dovdd);
+	if (ret) {
+		dev_err(sensor->dev, "failed to enable DOVDD regulator\n");
+		goto disable;
+	}
 
-		ret = regulator_enable(sensor->dvdd);
-		if (ret) {
-			dev_err(sensor->dev,
-				"failed to enable DVDD regulator\n");
-			goto disable;
-		}
+	ret = regulator_enable(sensor->avdd);
+	if (ret) {
+		dev_err(sensor->dev, "failed to enable AVDD regulator\n");
+		goto disable;
+	}
 
-		ret = clk_prepare_enable(sensor->extclk);
-		if (ret) {
-			dev_err(sensor->dev, "failed to enable EXTCLK clock\n");
-			goto disable;
-		}
+	ret = regulator_enable(sensor->dvdd);
+	if (ret) {
+		dev_err(sensor->dev, "failed to enable DVDD regulator\n");
+		goto disable;
+	}
+
+	ret = clk_prepare_enable(sensor->extclk);
+	if (ret) {
+		dev_err(sensor->dev, "failed to enable EXTCLK clock\n");
+		goto disable;
+	}
 
-		gpiod_set_value_cansleep(sensor->reset, 0);
-		gpiod_set_value_cansleep(sensor->powerdown, 0);
+	gpiod_set_value_cansleep(sensor->reset, 0);
+	gpiod_set_value_cansleep(sensor->powerdown, 0);
+
+	/* Time to enter streaming mode according to power timings. */
+	usleep_range(10000, 12000);
+
+	return 0;
 
-		/* Time to enter streaming mode according to power timings. */
-		usleep_range(10000, 12000);
-	} else {
 disable:
-		gpiod_set_value_cansleep(sensor->powerdown, 1);
-		gpiod_set_value_cansleep(sensor->reset, 1);
+	gpiod_set_value_cansleep(sensor->powerdown, 1);
+	gpiod_set_value_cansleep(sensor->reset, 1);
 
-		clk_disable_unprepare(sensor->extclk);
+	clk_disable_unprepare(sensor->extclk);
 
-		regulator_disable(sensor->dvdd);
-		regulator_disable(sensor->avdd);
-		regulator_disable(sensor->dovdd);
-	}
+	regulator_disable(sensor->dvdd);
+	regulator_disable(sensor->avdd);
+	regulator_disable(sensor->dovdd);
 
 	return ret;
 }



             reply	other threads:[~2021-12-02  9:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02  9:06 Joe Perches [this message]
2021-12-07 12:24 ` Sakari Ailus
2021-12-07 14:47   ` Joe Perches
2021-12-15  8:01     ` Sakari Ailus
2021-12-15  8:07       ` Joe Perches

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=c6189daaac183ddf51da1444c597d8577c1ac416.camel@perches.com \
    --to=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=paul.kocialkowski@bootlin.com \
    /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®