All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon South <simon@simonsouth.net>
To: tpiepho@gmail.com, thierry.reding@gmail.com,
	u.kleine-koenig@pengutronix.de, robin.murphy@arm.com,
	lee.jones@linaro.org, heiko@sntech.de, bbrezillon@kernel.org,
	linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Cc: simon@simonsouth.net
Subject: [PATCH v3 5/7] pwm: rockchip: rockchip_pwm_probe(): Remove unneeded goto target
Date: Wed, 23 Dec 2020 11:01:07 -0500	[thread overview]
Message-ID: <0637b8ebea49b30e5e675385225d59d028077421.1608735481.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1608735481.git.simon@simonsouth.net>

Eliminate the remaining goto target in rockchip_pwm_probe() by moving the
code that follows it to the point where it is invoked.

The target no longer serves any purpose as the error-handling portions of
this function no longer share any recovery steps.

Signed-off-by: Simon South <simon@simonsouth.net>
---
 drivers/pwm/pwm-rockchip.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index d904a5d24885..80f5e69d9b8a 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -336,7 +336,8 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(pc->pclk);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't enable APB clk: %d\n", ret);
-		goto err_clk;
+		clk_disable_unprepare(pc->clk);
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, pc);
@@ -372,11 +373,6 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	}
 
 	return 0;
-
-err_clk:
-	clk_disable_unprepare(pc->clk);
-
-	return ret;
 }
 
 static int rockchip_pwm_remove(struct platform_device *pdev)
-- 
2.29.2


WARNING: multiple messages have this Message-ID (diff)
From: Simon South <simon@simonsouth.net>
To: tpiepho@gmail.com, thierry.reding@gmail.com,
	u.kleine-koenig@pengutronix.de, robin.murphy@arm.com,
	lee.jones@linaro.org, heiko@sntech.de, bbrezillon@kernel.org,
	linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Cc: simon@simonsouth.net
Subject: [PATCH v3 5/7] pwm: rockchip: rockchip_pwm_probe(): Remove unneeded goto target
Date: Wed, 23 Dec 2020 11:01:07 -0500	[thread overview]
Message-ID: <0637b8ebea49b30e5e675385225d59d028077421.1608735481.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1608735481.git.simon@simonsouth.net>

Eliminate the remaining goto target in rockchip_pwm_probe() by moving the
code that follows it to the point where it is invoked.

The target no longer serves any purpose as the error-handling portions of
this function no longer share any recovery steps.

Signed-off-by: Simon South <simon@simonsouth.net>
---
 drivers/pwm/pwm-rockchip.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index d904a5d24885..80f5e69d9b8a 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -336,7 +336,8 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(pc->pclk);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't enable APB clk: %d\n", ret);
-		goto err_clk;
+		clk_disable_unprepare(pc->clk);
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, pc);
@@ -372,11 +373,6 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	}
 
 	return 0;
-
-err_clk:
-	clk_disable_unprepare(pc->clk);
-
-	return ret;
 }
 
 static int rockchip_pwm_remove(struct platform_device *pdev)
-- 
2.29.2


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Simon South <simon@simonsouth.net>
To: tpiepho@gmail.com, thierry.reding@gmail.com,
	u.kleine-koenig@pengutronix.de, robin.murphy@arm.com,
	lee.jones@linaro.org, heiko@sntech.de, bbrezillon@kernel.org,
	linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Cc: simon@simonsouth.net
Subject: [PATCH v3 5/7] pwm: rockchip: rockchip_pwm_probe(): Remove unneeded goto target
Date: Wed, 23 Dec 2020 11:01:07 -0500	[thread overview]
Message-ID: <0637b8ebea49b30e5e675385225d59d028077421.1608735481.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1608735481.git.simon@simonsouth.net>

Eliminate the remaining goto target in rockchip_pwm_probe() by moving the
code that follows it to the point where it is invoked.

The target no longer serves any purpose as the error-handling portions of
this function no longer share any recovery steps.

Signed-off-by: Simon South <simon@simonsouth.net>
---
 drivers/pwm/pwm-rockchip.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index d904a5d24885..80f5e69d9b8a 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -336,7 +336,8 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(pc->pclk);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't enable APB clk: %d\n", ret);
-		goto err_clk;
+		clk_disable_unprepare(pc->clk);
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, pc);
@@ -372,11 +373,6 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
 	}
 
 	return 0;
-
-err_clk:
-	clk_disable_unprepare(pc->clk);
-
-	return ret;
 }
 
 static int rockchip_pwm_remove(struct platform_device *pdev)
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-12-23 16:04 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-23 16:01 [PATCH v3 0/7] pwm: rockchip: Eliminate potential race condition when probing Simon South
2020-12-23 16:01 ` Simon South
2020-12-23 16:01 ` Simon South
2020-12-23 16:01 ` [PATCH v3 1/7] pwm: rockchip: Enable APB clock during register access while probing Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2020-12-25  7:11   ` Kever Yang
2021-01-13  7:23   ` Uwe Kleine-König
2021-01-13  7:23     ` Uwe Kleine-König
2021-01-13  7:23     ` Uwe Kleine-König
2020-12-23 16:01 ` [PATCH v3 2/7] pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare() Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2021-01-13  7:31   ` Uwe Kleine-König
2021-01-13  7:31     ` Uwe Kleine-König
2021-01-13  7:31     ` Uwe Kleine-König
2020-12-23 16:01 ` [PATCH v3 3/7] pwm: rockchip: Replace "bus clk" with "PWM clk" Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2020-12-25  7:13   ` Kever Yang
2021-01-13  7:33   ` Uwe Kleine-König
2021-01-13  7:33     ` Uwe Kleine-König
2021-01-13  7:33     ` Uwe Kleine-König
2020-12-23 16:01 ` [PATCH v3 4/7] pwm: rockchip: Eliminate potential race condition when probing Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2021-01-13  7:37   ` Uwe Kleine-König
2021-01-13  7:37     ` Uwe Kleine-König
2021-01-13  7:37     ` Uwe Kleine-König
2020-12-23 16:01 ` Simon South [this message]
2020-12-23 16:01   ` [PATCH v3 5/7] pwm: rockchip: rockchip_pwm_probe(): Remove unneeded goto target Simon South
2020-12-23 16:01   ` Simon South
2020-12-25  7:14   ` Kever Yang
2021-01-13  7:38   ` Uwe Kleine-König
2021-01-13  7:38     ` Uwe Kleine-König
2021-01-13  7:38     ` Uwe Kleine-König
2020-12-23 16:01 ` [PATCH v3 6/7] pwm: rockchip: Enable PWM clock of probed device only if running Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2020-12-25  7:14   ` Kever Yang
2021-01-13  7:50   ` Uwe Kleine-König
2021-01-13  7:50     ` Uwe Kleine-König
2021-01-13  7:50     ` Uwe Kleine-König
2021-01-14 15:22     ` Simon South
2021-01-14 15:22       ` Simon South
2021-01-14 15:22       ` Simon South
2020-12-23 16:01 ` [PATCH v3 7/7] pwm: rockchip: Enable clock before calling clk_get_rate() Simon South
2020-12-23 16:01   ` Simon South
2020-12-23 16:01   ` Simon South
2021-01-13  7:54   ` Uwe Kleine-König
2021-01-13  7:54     ` Uwe Kleine-König
2021-01-13  7:54     ` Uwe Kleine-König
2020-12-25  7:10 ` [PATCH v3 0/7] pwm: rockchip: Eliminate potential race condition when probing Kever Yang
2021-01-05 11:26   ` [PATCH v3 0/7] pwm: rockchip: Eliminate potential race condition when probing【请注意,邮件由kever.yang@gmail.com代发】 David Wu
2021-01-05 11:26     ` David Wu
2021-01-05 11:26     ` David Wu
2021-01-13  9:19     ` Uwe Kleine-König
2021-01-13  9:19       ` Uwe Kleine-König
2021-01-13  9:19       ` Uwe Kleine-König

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=0637b8ebea49b30e5e675385225d59d028077421.1608735481.git.simon@simonsouth.net \
    --to=simon@simonsouth.net \
    --cc=bbrezillon@kernel.org \
    --cc=heiko@sntech.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=robin.murphy@arm.com \
    --cc=thierry.reding@gmail.com \
    --cc=tpiepho@gmail.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /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 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.