Linux-Clk Archive on lore.kernel.org
 help / color / Atom feed
From: Andi Shyti <andi.shyti@samsung.com>
To: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Kukjin Kim <kgene@kernel.org>,
	Krzysztof Kozlowski <k.kozlowski@samsung.com>,
	Mark Brown <broonie@kernel.org>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	Tomasz Figa <tomasz.figa@gmail.com>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>
Cc: Chanwoo Choi <cw00.choi@samsung.com>,
	Jaehoon Chung <jh80.chung@samsung.com>,
	linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-spi@vger.kernel.org,
	Andi Shyti <andi.shyti@samsung.com>,
	Andi Shyti <andi@etezian.org>
Subject: [PATCH v2 3/7] spi: s3c64xx: rename goto labels to meaningful names
Date: Fri, 08 Jul 2016 23:46:37 +0900
Message-ID: <1467989201-14661-4-git-send-email-andi.shyti@samsung.com> (raw)
In-Reply-To: <1467989201-14661-1-git-send-email-andi.shyti@samsung.com>

The goto labels of the style of

  err4:
  err3:
  err2:
  err1:

are complex to insert in between new errors without renaming all
the goto statements. Replace the errX naming style to meaningful
names in order to make it easier to insert new goto exit points.

Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/spi/spi-s3c64xx.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 6f2e91a..0784a4d 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1071,7 +1071,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 		if (ret < 0) {
 			dev_err(&pdev->dev, "failed to get alias id, errno %d\n",
 				ret);
-			goto err0;
+			goto err_deref_master;
 		}
 		sdd->port_id = ret;
 	} else {
@@ -1109,13 +1109,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
 	if (IS_ERR(sdd->regs)) {
 		ret = PTR_ERR(sdd->regs);
-		goto err0;
+		goto err_deref_master;
 	}
 
 	if (sci->cfg_gpio && sci->cfg_gpio()) {
 		dev_err(&pdev->dev, "Unable to config gpio\n");
 		ret = -EBUSY;
-		goto err0;
+		goto err_deref_master;
 	}
 
 	/* Setup clocks */
@@ -1123,13 +1123,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	if (IS_ERR(sdd->clk)) {
 		dev_err(&pdev->dev, "Unable to acquire clock 'spi'\n");
 		ret = PTR_ERR(sdd->clk);
-		goto err0;
+		goto err_deref_master;
 	}
 
 	if (clk_prepare_enable(sdd->clk)) {
 		dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");
 		ret = -EBUSY;
-		goto err0;
+		goto err_deref_master;
 	}
 
 	sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);
@@ -1138,13 +1138,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev,
 			"Unable to acquire clock '%s'\n", clk_name);
 		ret = PTR_ERR(sdd->src_clk);
-		goto err2;
+		goto err_disable_clk;
 	}
 
 	if (clk_prepare_enable(sdd->src_clk)) {
 		dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
 		ret = -EBUSY;
-		goto err2;
+		goto err_disable_clk;
 	}
 
 	pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
@@ -1164,7 +1164,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	if (ret != 0) {
 		dev_err(&pdev->dev, "Failed to request IRQ %d: %d\n",
 			irq, ret);
-		goto err3;
+		goto err_pm_put;
 	}
 
 	writel(S3C64XX_SPI_INT_RX_OVERRUN_EN | S3C64XX_SPI_INT_RX_UNDERRUN_EN |
@@ -1174,7 +1174,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	ret = devm_spi_register_master(&pdev->dev, master);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
-		goto err3;
+		goto err_pm_put;
 	}
 
 	dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n",
@@ -1188,15 +1188,15 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 
 	return 0;
 
-err3:
+err_pm_put:
 	pm_runtime_put_noidle(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 	pm_runtime_set_suspended(&pdev->dev);
 
 	clk_disable_unprepare(sdd->src_clk);
-err2:
+err_disable_clk:
 	clk_disable_unprepare(sdd->clk);
-err0:
+err_deref_master:
 	spi_master_put(master);
 
 	return ret;
-- 
2.8.1

  parent reply index

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-08 14:46 [PATCH v2 0/7] spi s3c64xx ioclk handling Andi Shyti
2016-07-08 14:46 ` [PATCH v2 1/7] bindings: spi-samsung: add exynos5433 spi compatible Andi Shyti
2016-07-08 20:23   ` Krzysztof Kozlowski
2016-07-11 10:49   ` Sylwester Nawrocki
2016-07-14 16:33   ` Applied "spi: s3c64xx: add exynos5433 spi compatible" to the spi tree Mark Brown
2016-07-08 14:46 ` [PATCH v2 2/7] bindings: spi-samsung: document the clocks and the clock-name property Andi Shyti
2016-07-08 14:46 ` Andi Shyti [this message]
2016-07-14 16:32   ` Applied "spi: s3c64xx: rename goto labels to meaningful names" to the spi tree Mark Brown
2016-07-08 14:46 ` [PATCH v2 4/7] spi: s3c64xx: use error code from clk_prepare_enable() Andi Shyti
2016-07-08 20:33   ` Krzysztof Kozlowski
2016-07-14 16:32   ` Applied "spi: s3c64xx: use error code from clk_prepare_enable()" to the spi tree Mark Brown
2016-07-08 14:46 ` [PATCH v2 5/7] spi: s3c64xx: add exynos5433 compatible for ioclk handling Andi Shyti
2016-07-08 16:13   ` Michael Turquette
2016-07-08 16:31     ` Andi Shyti
2016-07-08 20:39   ` Krzysztof Kozlowski
2016-07-14 16:32   ` Applied "spi: s3c64xx: add Exynos5433 compatible for ioclk handling" to the spi tree Mark Brown
2016-07-08 14:46 ` [PATCH v2 6/7] spi: s3c64xx: restore removed comments Andi Shyti
2016-07-08 16:17   ` Michael Turquette
2016-07-08 16:35     ` Andi Shyti
2016-07-11 10:33     ` Sylwester Nawrocki
2016-07-11 22:17       ` Michael Turquette
2016-07-12 12:16         ` Sylwester Nawrocki
2016-07-12  6:54       ` [PATCH v3 " Andi Shyti
2016-07-12  8:22         ` Mark Brown
2016-07-12  8:25           ` Andi Shyti
2016-07-12  9:00             ` Mark Brown
2016-07-12 18:07         ` Michael Turquette
2016-07-14 16:32         ` Applied "spi: s3c64xx: restore removed comments" to the spi tree Mark Brown
2016-07-08 20:35   ` [PATCH v2 6/7] spi: s3c64xx: restore removed comments Krzysztof Kozlowski
2016-07-08 14:46 ` [PATCH v2 7/7] clk: exynos5433: remove CLK_IGNORE_UNUSED flag from SPI clocks Andi Shyti
2016-07-11 10:58   ` Sylwester Nawrocki
2016-07-08 16:21 ` [PATCH v2 0/7] spi s3c64xx ioclk handling Michael Turquette
2016-07-11  2:36 [PATCH v3] bindings: spi-samsung: document the clocks and the clock-name property Andi Shyti
2016-07-14 16:32 ` Applied "spi: s3c64xx: document the clocks and the clock-name property" to the spi tree Mark Brown

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=1467989201-14661-4-git-send-email-andi.shyti@samsung.com \
    --to=andi.shyti@samsung.com \
    --cc=andi@etezian.org \
    --cc=broonie@kernel.org \
    --cc=cw00.choi@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jh80.chung@samsung.com \
    --cc=k.kozlowski@samsung.com \
    --cc=kgene@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mturquette@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=s.nawrocki@samsung.com \
    --cc=sboyd@codeaurora.org \
    --cc=tomasz.figa@gmail.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

Linux-Clk Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-clk/0 linux-clk/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-clk linux-clk/ https://lore.kernel.org/linux-clk \
		linux-clk@vger.kernel.org
	public-inbox-index linux-clk

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-clk


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git