From patchwork Wed May 3 09:27:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SmlhLXdlaSBDaGFuZyAo5by15L2z5YGJKQ==?= X-Patchwork-Id: 13229969 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0E79C77B7F for ; Wed, 3 May 2023 09:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9+xPBrPIOF8FOrzMP/ZyHar7tfCN2Z7Jw0UqoW4NTp0=; b=O8O9vCctYhJsz7 jjYs5BqwtREAR2I8geqAaC2UxeVGwm/ojR0rBFN8kkpdAWNSdstnYdVFuABXbm5lHgbR9L4zgO1mY bAuwqxqR8V+yEZjwDlz9g3t/XA15vrOZy7CF50QhIFGqY1elzd3aOWUxFVlsh5tavqoN3PeJaiOxr QQYEyGVgYEaVhYy6xhM1CNG7BIiwDWm6tR2sth4ohKEBZCkr3jn8E2ezhpBLEJLOXuPESGMFqtVDy dO8RcitcK/kY0Pet22CQKdUM+AID+IVwXJPH1tLIEumZs+DZmcI94vcO57BVggAhiO7fEcawb0dhY iyV7LZgT0ZSx99zqiTiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pu8nQ-0040kP-1T; Wed, 03 May 2023 09:29:12 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pu8nN-0040hz-1f; Wed, 03 May 2023 09:29:10 +0000 X-UUID: ee207874e99411ed912e1518a6540028-20230503 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=Z0lLixHbQ8wSDaTZTRuJyrz8BaXzgVtyHI8619yCq7I=; b=M7xdefALEeyeluoS1ESaCeSOj9Xhz2aZHStZwSLDpXMfUuO8sFrQ1uzbRh0w9c6ghHcjumkKO/1D4PvBplPH0w5Scjz9BmBFDLh5wihTdU1ZlhaQMkDLD9BOZdtSJZ31w3vjcKss06GKOalso6ptSCn3rOXMZLS5MC6ueERCzuY=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.23,REQID:6adb767d-0541-4cda-b43f-1130ffeb84bd,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:697ab71,CLOUDID:4773a8bf-e32c-4c97-918d-fbb3fc224d4e,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: ee207874e99411ed912e1518a6540028-20230503 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 553867411; Wed, 03 May 2023 02:28:57 -0700 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 3 May 2023 17:28:21 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 3 May 2023 17:28:21 +0800 From: jia-wei.chang To: MyungJoo Ham , Kyungmin Park , Chanwoo Choi , "Matthias Brugger" , AngeloGioacchino Del Regno , Johnson Wang , Jia-Wei Chang CC: , , , , Subject: [PATCH] PM / devfreq: mtk-cci: refactor error handling of probe and remove Date: Wed, 3 May 2023 17:27:42 +0800 Message-ID: <20230503092742.19404-1-jia-wei.chang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230503_022909_566090_BD7DD73B X-CRM114-Status: GOOD ( 14.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Jia-Wei Chang To refactor the regulator/clk handlers so it can follow the way of "Free the Last Thing Style". Signed-off-by: Jia-Wei Chang Fixes: 86d231b1db1b ("PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver") --- drivers/devfreq/mtk-cci-devfreq.c | 47 ++++++++++++++++++------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c index e5458ada5197..d2f743774147 100644 --- a/drivers/devfreq/mtk-cci-devfreq.c +++ b/drivers/devfreq/mtk-cci-devfreq.c @@ -294,14 +294,14 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) if (IS_ERR(drv->sram_reg)) { ret = PTR_ERR(drv->sram_reg); if (ret == -EPROBE_DEFER) - goto out_free_resources; + goto out_disable_proc_reg; drv->sram_reg = NULL; } else { ret = regulator_enable(drv->sram_reg); if (ret) { dev_err(dev, "failed to enable sram regulator\n"); - goto out_free_resources; + goto out_disable_proc_reg; } } @@ -316,12 +316,16 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) ret = clk_prepare_enable(drv->cci_clk); if (ret) - goto out_free_resources; + goto out_disable_sram_reg; + + ret = clk_prepare_enable(drv->inter_clk); + if (ret) + goto out_disable_cci_clock; ret = dev_pm_opp_of_add_table(dev); if (ret) { dev_err(dev, "failed to add opp table: %d\n", ret); - goto out_disable_cci_clk; + goto out_disable_inter_clock; } rate = clk_get_rate(drv->inter_clk); @@ -329,7 +333,7 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) if (IS_ERR(opp)) { ret = PTR_ERR(opp); dev_err(dev, "failed to get intermediate opp: %d\n", ret); - goto out_remove_opp_table; + goto out_free_opp_table; } drv->inter_voltage = dev_pm_opp_get_voltage(opp); dev_pm_opp_put(opp); @@ -339,7 +343,7 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) if (IS_ERR(opp)) { dev_err(dev, "failed to get opp\n"); ret = PTR_ERR(opp); - goto out_remove_opp_table; + goto out_free_opp_table; } opp_volt = dev_pm_opp_get_voltage(opp); @@ -348,13 +352,13 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to scale to highest voltage %lu in proc_reg\n", opp_volt); - goto out_remove_opp_table; + goto out_free_opp_table; } passive_data = devm_kzalloc(dev, sizeof(*passive_data), GFP_KERNEL); if (!passive_data) { ret = -ENOMEM; - goto out_remove_opp_table; + goto out_free_opp_table; } passive_data->parent_type = CPUFREQ_PARENT_DEV; @@ -365,29 +369,33 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) ret = -EPROBE_DEFER; dev_err(dev, "failed to add devfreq device: %ld\n", PTR_ERR(drv->devfreq)); - goto out_remove_opp_table; + goto out_free_opp_table; } drv->opp_nb.notifier_call = mtk_ccifreq_opp_notifier; ret = dev_pm_opp_register_notifier(dev, &drv->opp_nb); if (ret) { dev_err(dev, "failed to register opp notifier: %d\n", ret); - goto out_remove_opp_table; + goto out_free_opp_table; } return 0; -out_remove_opp_table: +out_free_opp_table: dev_pm_opp_of_remove_table(dev); -out_disable_cci_clk: +out_disable_inter_clock: + clk_disable_unprepare(drv->inter_clk); + +out_disable_cci_clock: clk_disable_unprepare(drv->cci_clk); -out_free_resources: - if (regulator_is_enabled(drv->proc_reg)) - regulator_disable(drv->proc_reg); - if (drv->sram_reg && regulator_is_enabled(drv->sram_reg)) +out_disable_sram_reg: + if (drv->sram_reg) regulator_disable(drv->sram_reg); +out_disable_proc_reg: + regulator_disable(drv->proc_reg); + return ret; } @@ -398,12 +406,13 @@ static int mtk_ccifreq_remove(struct platform_device *pdev) drv = platform_get_drvdata(pdev); - dev_pm_opp_unregister_notifier(dev, &drv->opp_nb); - dev_pm_opp_of_remove_table(dev); - clk_disable_unprepare(drv->cci_clk); regulator_disable(drv->proc_reg); if (drv->sram_reg) regulator_disable(drv->sram_reg); + clk_disable_unprepare(drv->cci_clk); + clk_disable_unprepare(drv->inter_clk); + dev_pm_opp_of_remove_table(dev); + dev_pm_opp_unregister_notifier(dev, &drv->opp_nb); return 0; }