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 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 F27F2C4828F for ; Fri, 2 Feb 2024 21:15:32 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Dem03edjk9ppMi5AwZ6Wuay4McAMSQwcAwgZz8uY5+A=; b=xDC7jqJp6ER6AR I5yMsDORrzYuwJjmcIL8iXTo3A3qyXtSJtKWBS/O0o2lvTzUbIEDJZVjhKeLfumWBxPu149O1ojRr afy3QAAnpy1TDT8KNtv+gYkLjuf2xP/73XmpgZ6pMzLv1qCoXJ9j49VjB55fZUQXpsr87FpnnZYYg 3NQKzUzYFbBIjiEwZY2jUwZaWJcOVew8e3QLeiPjkRoDyJRcgpHBcV2mR8CbLm0h2MFBCjdgC4QDB Af4p5+Wwgac5cOGLlPbwZWJP0r2Kl5IfriMr9ZLZeu6vejoF8wbLppA1Y3CnKQiTNDstTvnabw8Ww z0rpKrimEEYOGjuMowMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rW0sF-0000000DVDu-1jqo; Fri, 02 Feb 2024 21:14:59 +0000 Received: from fllv0016.ext.ti.com ([198.47.19.142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rW0ro-0000000DVBu-2syf for linux-arm-kernel@lists.infradead.org; Fri, 02 Feb 2024 21:14:48 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 412LEMbZ085689; Fri, 2 Feb 2024 15:14:22 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1706908462; bh=zgoKyKRzk2mlaXzGvR0gvmhQcCU8wlgUE8Q0I6gaFsc=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=I75KgkAQUsaPlBf/YLEiOSkHkEW05KrTLoHvGTLcje0odsTFPACke5MknbOKoOZ8k 6qC5DXfTiykIYoJxQwDbXcw1XqOAavzFtMk3BLxNfKqhtXnUTiMt9ThO1ONqy1dFhm fvzAWKy2F4Ysim5wFbsUNNS4jB3wGE/GlhOtrkt4= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 412LEMGe031234 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 2 Feb 2024 15:14:22 -0600 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 2 Feb 2024 15:14:21 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 2 Feb 2024 15:14:22 -0600 Received: from [10.249.42.149] ([10.249.42.149]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 412LELJI084221; Fri, 2 Feb 2024 15:14:21 -0600 Message-ID: <60d46d58-ad77-47e8-8ff6-bc05db7cf1be@ti.com> Date: Fri, 2 Feb 2024 15:14:20 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6/9] remoteproc: qcom_q6v5_wcss: Use devm_rproc_alloc() helper Content-Language: en-US To: Unnathi Chalicheemala , Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Konrad Dybcio , Patrice Chotard , Maxime Coquelin , Alexandre Torgue CC: , , , References: <20240123184632.725054-1-afd@ti.com> <20240123184632.725054-6-afd@ti.com> <256072b3-c1d0-4e11-9456-bbd50b84a310@quicinc.com> From: Andrew Davis In-Reply-To: <256072b3-c1d0-4e11-9456-bbd50b84a310@quicinc.com> X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240202_131447_028622_E6F41BE5 X-CRM114-Status: GOOD ( 14.12 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2/2/24 2:51 PM, Unnathi Chalicheemala wrote: > > > On 1/23/2024 10:46 AM, Andrew Davis wrote: >> Use the device lifecycle managed allocation function. This helps prevent >> mistakes like freeing out of order in cleanup functions and forgetting to >> free on error paths. >> >> Signed-off-by: Andrew Davis >> --- >> drivers/remoteproc/qcom_q6v5_wcss.c | 24 +++++++++--------------- >> 1 file changed, 9 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c >> index cff1fa07d1def..94f68c919ee62 100644 >> --- a/drivers/remoteproc/qcom_q6v5_wcss.c >> +++ b/drivers/remoteproc/qcom_q6v5_wcss.c >> @@ -1011,8 +1011,8 @@ static int q6v5_wcss_probe(struct platform_device *pdev) >> if (!desc) >> return -EINVAL; >> >> - rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops, >> - desc->firmware_name, sizeof(*wcss)); >> + rproc = devm_rproc_alloc(&pdev->dev, pdev->name, desc->ops, >> + desc->firmware_name, sizeof(*wcss)); >> if (!rproc) { >> dev_err(&pdev->dev, "failed to allocate rproc\n"); >> return -ENOMEM; >> @@ -1027,29 +1027,29 @@ static int q6v5_wcss_probe(struct platform_device *pdev) >> >> ret = q6v5_wcss_init_mmio(wcss, pdev); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> ret = q6v5_alloc_memory_region(wcss); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> if (wcss->version == WCSS_QCS404) { >> ret = q6v5_wcss_init_clock(wcss); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> ret = q6v5_wcss_init_regulator(wcss); >> if (ret) >> - goto free_rproc; >> + return ret; >> } >> >> ret = q6v5_wcss_init_reset(wcss, desc); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> ret = qcom_q6v5_init(&wcss->q6v5, pdev, rproc, desc->crash_reason_smem, NULL, NULL); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> qcom_add_glink_subdev(rproc, &wcss->glink_subdev, "q6wcss"); >> qcom_add_ssr_subdev(rproc, &wcss->ssr_subdev, "q6wcss"); >> @@ -1061,16 +1061,11 @@ static int q6v5_wcss_probe(struct platform_device *pdev) >> >> ret = rproc_add(rproc); >> if (ret) >> - goto free_rproc; >> + return ret; >> >> platform_set_drvdata(pdev, rproc); >> >> return 0; >> - >> -free_rproc: >> - rproc_free(rproc); >> - >> - return ret; > > This return statement should stay, right? > No path goes to "free_rproc" anymore, so we always do the "return 0;" above on non-error paths. Andrew >> } >> >> static void q6v5_wcss_remove(struct platform_device *pdev) >> @@ -1080,7 +1075,6 @@ static void q6v5_wcss_remove(struct platform_device *pdev) >> >> qcom_q6v5_deinit(&wcss->q6v5); >> rproc_del(rproc); >> - rproc_free(rproc); >> } >> >> static const struct wcss_data wcss_ipq8074_res_init = { _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel