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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E38FC28CF5 for ; Wed, 26 Jan 2022 07:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiAZH33 (ORCPT ); Wed, 26 Jan 2022 02:29:29 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:57690 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229681AbiAZH33 (ORCPT ); Wed, 26 Jan 2022 02:29:29 -0500 X-UUID: 9c06bc2794244621985796a3c8538f65-20220126 X-UUID: 9c06bc2794244621985796a3c8538f65-20220126 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 448908259; Wed, 26 Jan 2022 15:29:24 +0800 Received: from mtkexhb01.mediatek.inc (172.21.101.102) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 26 Jan 2022 15:29:23 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb01.mediatek.inc (172.21.101.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 26 Jan 2022 15:29:23 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 26 Jan 2022 15:29:23 +0800 From: Miles Chen To: CC: , , , , , , , Subject: Re: [PATCH 21/31] clk: mediatek: cpumux: Implement error handling in register API Date: Wed, 26 Jan 2022 15:29:23 +0800 Message-ID: <20220126072923.10391-1-miles.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220122091731.283592-22-wenst@chromium.org> References: <20220122091731.283592-22-wenst@chromium.org> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org > The cpumux clk type registration function does not stop or return errors > if any clk failed to be registered, nor does it implement an error > handling path. This may result in a partially working device if any > step failed. > > Make the register function return proper error codes, and bail out if > errors occur. Proper cleanup, i.e. unregister any clks that were > successfully registered, is done in the new error path. > > Signed-off-by: Chen-Yu Tsai Reviewed-by: Miles Chen > --- > drivers/clk/mediatek/clk-cpumux.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/mediatek/clk-cpumux.c b/drivers/clk/mediatek/clk-cpumux.c > index 658aee789f44..499c60432280 100644 > --- a/drivers/clk/mediatek/clk-cpumux.c > +++ b/drivers/clk/mediatek/clk-cpumux.c > @@ -123,13 +123,26 @@ int mtk_clk_register_cpumuxes(struct device_node *node, > clk = mtk_clk_register_cpumux(mux, regmap); > if (IS_ERR(clk)) { > pr_err("Failed to register clk %s: %pe\n", mux->name, clk); > - continue; > + goto err; > } > > clk_data->clks[mux->id] = clk; > } > > return 0; > + > +err: > + while (--i >= 0) { > + const struct mtk_composite *mux = &clks[i]; > + > + if (IS_ERR_OR_NULL(clk_data->clks[mux->id])) > + continue; > + > + mtk_clk_unregister_cpumux(clk_data->clks[mux->id]); > + clk_data->clks[mux->id] = ERR_PTR(-ENOENT); > + } > + > + return PTR_ERR(clk); > } > > void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num, > -- > 2.35.0.rc0.227.g00780c9af4-goog