From patchwork Wed Sep 14 20:04:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9332373 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C49AF6077A for ; Wed, 14 Sep 2016 20:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B67652A260 for ; Wed, 14 Sep 2016 20:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB2472A262; Wed, 14 Sep 2016 20:05:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EE392A239 for ; Wed, 14 Sep 2016 20:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933422AbcINUEg (ORCPT ); Wed, 14 Sep 2016 16:04:36 -0400 Received: from mout.web.de ([212.227.17.11]:53905 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933409AbcINUEb (ORCPT ); Wed, 14 Sep 2016 16:04:31 -0400 Received: from [192.168.1.3] ([78.48.193.118]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MFL6u-1bpk310Jj2-00EQLh; Wed, 14 Sep 2016 22:04:15 +0200 Subject: [PATCH 4/4] clk/Renesas-MSTP: Rename jump labels in cpg_mstp_attach_dev() To: linux-clk@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart , Michael Turquette , Simon Horman , Stephen Boyd , Ulf Hansson References: <566ABCD9.1060404@users.sourceforge.net> <1575ddf1-bd1a-fe98-046a-a586eb30fe47@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Wed, 14 Sep 2016 22:04:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1575ddf1-bd1a-fe98-046a-a586eb30fe47@users.sourceforge.net> X-Provags-ID: V03:K0:t3AHQc5PX3SY4Z17Rk8PE0ulWc1mSyxPxey1XMmQvApaqf3HPw1 2kj12zTHmsmVpJBzsPuzUgov0N5mrGqTijZWvOJI0vWesM/oTe+S3KjgCRRtuBPj2U+Iwfo 6XxfptOxUex84HkVrR4hSHMw/j6/N/ThNWoSEwMIMccmpnIluPw7/4rglf925ZjWDbuhifc Kbep1pyLYQd06Fud83kfg== X-UI-Out-Filterresults: notjunk:1; V01:K0:mvAKaQ18cy4=:kfSXhBzWP/SRPzNWsqBpY+ CNBvYTzTdGPqItOyG/w6E2M4UJN2Q4FBm2bIEfPliXXZMjA9rTLLRBsECnPMxww1szcARR9Sz uNCrqtsVZ38oX5ap7tb06dBAxQ8xIS0ynbNX17xVjnFqt4fPJez2FDhh3XoSynRC7/ZSsP/x5 LAL0gwNFkyw8zqfGeYvHMfrnrG2o3ah14IkC4vYDBP6YJLY81WFUGry1L6yAb2Jh2ucUDIbQh KcJ8JxqqHEryZVUXLnoJEEu/QWcEuz8cDDri7iRLoCYBge40y7I3TnNXBPVHyMX9mWZrQTOYR 8uVLQ7XItbgitxVn99eelof+dXOTbe88d70Mai0LziKrL3uZJ1QnRb5Sku60KO0eAk63UyrZj 0/s2glQb8afnegV4m+gf2K9nKcoPupccsaaVMkqf4Yp6QPO9fNQtFIzkANk9Aepku9Z5TbT0X qYWIi7+8VA/Az3I8cPmcq43AVJWUTVKurpnRJG1G4ugVFYmnOr5PQrQv4brO54vRFJOTabmwv ZiOo5lfUa0d5vQR69YQnTtB/CRIMxf6zhkdhx3s8gGtDQzg5hGevSfXEOE+tpiQZuPqZZOv7N gsD+LnbaWuO8IN9Pq7+VJaYqQhYXDoowDdiZc8pbk/s1/HR5ZYcjyfPfv9yDNqCqsrPLCqlQ8 Ovuf8k4XLamtcciwABU3iYZCIYyDpadveAkD6LkJrT7Km9qQsEeQfyFPxBOmcYJMqDLZez58S j++z98e6V4QAnhmBBrwCHpCo4N9xquHEc3OkNYF3r7eCJ5puXACqVPe/RivogTwf4q+2rcrr9 EA4bYIq Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 14 Sep 2016 21:41:50 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/clk/renesas/clk-mstp.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c index 6c82e0e..2f90718 100644 --- a/drivers/clk/renesas/clk-mstp.c +++ b/drivers/clk/renesas/clk-mstp.c @@ -256,19 +256,18 @@ int cpg_mstp_attach_dev(struct generic_pm_domain *unused, struct device *dev) &clkspec)) { if (of_device_is_compatible(clkspec.np, "renesas,cpg-mstp-clocks")) - goto found; + goto get_clk; /* BSC on r8a73a4/sh73a0 uses zb_clk instead of an mstp clock */ if (!strcmp(clkspec.np->name, "zb_clk")) - goto found; + goto get_clk; of_node_put(clkspec.np); i++; } return 0; - -found: + get_clk: clk = of_clk_get_from_provider(&clkspec); of_node_put(clkspec.np); @@ -278,20 +277,19 @@ found: error = pm_clk_create(dev); if (error) { dev_err(dev, "pm_clk_create failed %d\n", error); - goto fail_put; + goto put_clk; } error = pm_clk_add_clk(dev, clk); if (error) { dev_err(dev, "pm_clk_add_clk %pC failed %d\n", clk, error); - goto fail_destroy; + goto destroy_clk; } return 0; - -fail_destroy: + destroy_clk: pm_clk_destroy(dev); -fail_put: + put_clk: clk_put(clk); return error; }