From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755130AbcGHMS4 (ORCPT ); Fri, 8 Jul 2016 08:18:56 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:33109 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754736AbcGHMSe (ORCPT ); Fri, 8 Jul 2016 08:18:34 -0400 X-AuditID: cbfee68d-f79876d000001436-4d-577f9a17294b From: Andi Shyti To: Mark Brown Cc: Sylwester Nawrocki , Kukjin Kim , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 1/4] spi: s3c64xx: rename goto labels to meaningful names Date: Fri, 08 Jul 2016 21:18:21 +0900 Message-id: <1467980304-14093-2-git-send-email-andi.shyti@samsung.com> X-Mailer: git-send-email 2.8.1 In-reply-to: <1467980304-14093-1-git-send-email-andi.shyti@samsung.com> References: <1467980304-14093-1-git-send-email-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsWyRsSkQFd8Vn24QfNvLYvtR56xWiz+8ZzJ YurDJ2wWr18YWvQ/fs1ssenxNVaLy7vmsFnMOL+PyaLx4012i8Nv2lkduDyuL/nE7LFpVSeb x+Yl9R59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CV8bPzGmvBHKmK9lmLmBsYW0S7GDk5JARM JGbun8UMYYtJXLi3nq2LkYtDSGAFo8TmJVsZYYp+rL7DCmILCSxllLgwxRrC/sgoceSiHojN JqAp0XT7BxuILSKgLHH1+14WkEHMAqeZJJadfwO2QVjAU2LbyndgNouAqsS1aZuAhnJw8Aq4 Scw56QyxS07i8vQHYHM4Bdwl1hw5xQaxy02i+WQnK8hMCYF17BK3/65gh5gjIPFt8iEWkDkS ArISmw5APSMpcXDFDZYJjMILGBlWMYqmFiQXFCelFxnqFSfmFpfmpesl5+duYgSG/+l/z3p3 MN4+YH2IUYCDUYmH10C8PlyINbGsuDL3EKMp0IaJzFKiyfnAKMsriTc0NjOyMDUxNTYytzRT EudVlPoZLCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoGxKvDtKw7V7CmrjgapfDF+k1j67PfX iFlMkmFf1+p9TO28wRlb0v/u1sUZ/r4nbvYktT+0dbPa4NiwSy/GIOmiWYnlosIHN2cdcxdl atbgUjytcLd5abTultV/Frne3HmJyaN88v7oc0UFuns3fDbeyuf1O2tOUEN1o8Xt9o+vdMXn 3T0hWFKuxFKckWioxVxUnAgAbKU1xXoCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRmVeSWpSXmKPExsVy+t9jAV3xWfXhBs+Oq1hsP/KM1WLxj+dM FlMfPmGzeP3C0KL/8Wtmi02Pr7FaXN41h81ixvl9TBaNH2+yWxx+087qwOVxfcknZo9NqzrZ PDYvqffo27KK0ePzJrkA1qgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8 xNxUWyUXnwBdt8wcoKOUFMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBk/ O6+xFsyRqmiftYi5gbFFtIuRk0NCwETix+o7rBC2mMSFe+vZQGwhgaWMEhemWEPYHxkljlzU A7HZBDQlmm7/AKsREVCWuPp9L0sXIxcHs8BpJoll598wgySEBTwltq18B2azCKhKXJu2CWgB BwevgJvEnJPOELvkJC5PfwA2h1PAXWLNkVNQe90kmk92sk5g5F3AyLCKUSK1ILmgOCk91ygv tVyvODG3uDQvXS85P3cTIzjGnknvYDy8y/0QowAHoxIPb0BdfbgQa2JZcWXuIUYJDmYlEd6K 6UAh3pTEyqrUovz4otKc1OJDjKZAd01klhJNzgfGf15JvKGxiZmRpZG5oYWRsbmSOO/j/+vC hATSE0tSs1NTC1KLYPqYODilGhgdhZpDyqfzmgey5iaGZl2/H8zV1OQje8ny7jSpS7MvpS3Y PPEDd7egHuf+zWufNGYnnrZ5+rQyr4xjZkVt9tll6T90ZXt3pgqn/pi6eHVsNhfv6urmfVMW yR1N/tiqrP255m2sUoG11TMzRZ0Yr2jHg/fYGoy9N8lP/Pj38f6XO1Nu7szhP6rEUpyRaKjF XFScCADonj74xwIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In goto labels of the style of err4: err3: err2: err1: is complex to insert in between new errors without renaming all the goto statments. Replace the errX naming style to meaningful names in order to make it easier to insert new goto exit ponts. Signed-off-by: Andi Shyti --- 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..2ab42b2 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_power_off; } 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_power_off; } 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_power_off: 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