From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFCCFC47092 for ; Wed, 2 Jun 2021 08:33:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8784613CD for ; Wed, 2 Jun 2021 08:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229571AbhFBIf3 (ORCPT ); Wed, 2 Jun 2021 04:35:29 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:3345 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232654AbhFBIf1 (ORCPT ); Wed, 2 Jun 2021 04:35:27 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Fw2Hb2Ktfz19S5d; Wed, 2 Jun 2021 16:28:59 +0800 (CST) Received: from dggema762-chm.china.huawei.com (10.1.198.204) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 16:33:41 +0800 Received: from huawei.com (10.175.127.227) by dggema762-chm.china.huawei.com (10.1.198.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Wed, 2 Jun 2021 16:33:41 +0800 From: Yu Kuai To: , , CC: , , , Subject: [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Date: Wed, 2 Jun 2021 16:42:59 +0800 Message-ID: <20210602084259.1267768-1-yukuai3@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <162262008540.4130789.916741380026683860@swboyd.mtv.corp.google.com> References: <162262008540.4130789.916741380026683860@swboyd.mtv.corp.google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggema762-chm.china.huawei.com (10.1.198.204) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __socfpga_pll_init() should fail if of_clk_add_provider() failed. remove 'rc' in the meantime to avoid gcc '-Wunused-but-set-variable' warning. Signed-off-by: Yu Kuai --- changes in V2: - remove 'rc' and use err' instead of 'rc' - err out if of_clk_add_provider() failed drivers/clk/socfpga/clk-pll.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c index dcb573d44034..5a9eec2eca80 100644 --- a/drivers/clk/socfpga/clk-pll.c +++ b/drivers/clk/socfpga/clk-pll.c @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node, const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; struct device_node *clkmgr_np; - int rc; int err; of_property_read_u32(node, "reg", ®); @@ -110,12 +109,16 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node, hw_clk = &pll_clk->hw.hw; err = clk_hw_register(NULL, hw_clk); - if (err) { - kfree(pll_clk); - return ERR_PTR(err); - } - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); + if (err) + goto err_out; + err = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); + if (err) + goto err_out; return hw_clk; + +err_out: + kfree(pll_clk); + return ERR_PTR(err); } void __init socfpga_pll_init(struct device_node *node) -- 2.31.1