From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB2DC311581 for ; Mon, 22 Sep 2025 16:41:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758559264; cv=none; b=sJoM0CP626nzpbE2GAJfi59Xhn6NEG7YqFHvXes2srEMdsVhQsf20E9604hOVI+DKi3RZFoG6tD34E6ertoAEmciyMsFQkiekVN871PQDQ078yCws4BnMxuItMipZOWFJ3A5bdb7nAyMMoQlWnq27E964bSuyZ1D5Uoc4TCiG5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758559264; c=relaxed/simple; bh=1ZvXKVOnEWKPv0EuGqrvl/hwuFDcuRdXnxKxZqVvQdg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mYJTVouBeG7PvSjY9sB8Wsou91NzAb2lDpghjaEUUUtlu2I+BlS3xaKyD3ELnRjFz6drJl4srpHOBG9hWyEiGDNQ3mLJ2+U2JPEW+ssCKvaAlLoSTZLrw3q05OR2GqrHqlgecdWwqQ/YpFrjmgkcS8gogoDkTtC4qtHrAH0seko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AogPqOHj; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AogPqOHj" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-269af38418aso49120765ad.1 for ; Mon, 22 Sep 2025 09:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758559262; x=1759164062; darn=lists.linux.dev; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=8IhdqQk9DvI4AFmg9naSg1FH7sc1HQKYfUNgmIemfvA=; b=AogPqOHj+wRPGEzkxg/q/dtsDtRaXx9aZzJeZslRXm+bPocgbFnupHT9nCR0zLtSIP dohPS8zK1W5i3OpzwkClWLcD02ez6z7KSshfqrQJpOmDIDG2DekV5zCACXeybTfEDhlz Tn7m/gEFXRBAJws+2H2GKQDY//3EL2YwW6pvPRJFcMOQVEvjHXLj+6zHwJCxmi/uEffi uVphkzkPRGlMXCdtmcpTI6U0M9DtroWPt4+QQIS5x9gXQs6zYeTlbgjlrJNflQPwFWjl B9mKogiGG3vmcxAg+ktOJtEOSR4H+f/kKaXzE7x3GlRVQEIY5V+LT5UQl/bRwY1OTD/d /j5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758559262; x=1759164062; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8IhdqQk9DvI4AFmg9naSg1FH7sc1HQKYfUNgmIemfvA=; b=o3baFvcDbAjPFYVkm1v18SfAt7LapVCwEsBKHYe5QMGKMdp6XuuhqyH5DFXMHRHjig L5u+Mn66G5WxwT3rIe1hqkdUmVNY1yDo7XCbVeflDdr7p9HvtNLW+ndVgTuRvkuaioCl X3wsBDptWedWvg+5IJ8pOAduB2u0+gx2/yox4MbAqHnxQnxDP+0OiSCiRpJgk/XnLlm6 r8qe+xmRn2Jrn4EOXlUllgj5RfbfYUvKZRZQGFvcECIAej30lJaSEoOiwjffxbzTx+Cs VNk06pYZ9ssybXxZv1eFeCGXnqrIYq2/7TK8zzEN9NY/X/38lT07dLLxbpGQmsMcLm4d 1e6w== X-Forwarded-Encrypted: i=1; AJvYcCUPGN09SrXKmgllibJh8uIbMF2/OaY8TD7VSXDy1ttjBt5bfD1q5cTzS433np2Md7j18yY=@lists.linux.dev X-Gm-Message-State: AOJu0YyqvXRDUj93I7+14Zr9N5q/7RVY2BZDrYpfj2n41ewlP2Mp06VR 5iVxgE2QxtdZu0pZKkep2ZLb7Vrnwp0SYnzI56RFT0DyLyLJAzbZ5zFLUidt1K7Ug4s= X-Gm-Gg: ASbGncuak8muYgiYE5xlhqZh6z5AHNcFz2xdXIwEHIK6VLQNLdbTP+woe4aEXVKjOBA Ac+R4CLhWpS0N219s4SjzZjgun6pf2Uzho+naL2/DBEunrVhJ/RkHrQDH5oqowEIOWktOPRRZZW VPq/xxflvd0CNtIjf2rAjuZbe/nmHeLTmohEiuJWZzNnDlg6884J71IxxOM1EoUw29bFJCkwu85 NcgWQwlFH+elsJcYPg00mN/Rd9qTRUPZTHF883GpQ3JoR7Tng98xClLPkogaA/jA9j3fLSeEUw0 vUQ6fK69NDPGzkazKPxpioaWvvl9R7R18TPX3zxIZaZ8AW8dX7lQiG5vXpHDN4lGRRczkdOVGaA vJhpdPtE2ey5YWUIkIBJ3x96WYbtgFPT4ytyS0LdGHNJOHyv6HU4OJ7qBqN5/x8PqYS9+6KjXcs SEVzM1FMAgvauBtTkqk5kg5LyW X-Google-Smtp-Source: AGHT+IEfgeLF7s67XVRDD8PRT9D2ccPv3NRL1m9Ax/Yy510Mn/2xkDPBuMAlPcQAyv9mkisQ4XQ6SQ== X-Received: by 2002:a17:902:c402:b0:267:8049:7c7f with SMTP id d9443c01a7336-269ba3e9219mr175928935ad.7.1758559262001; Mon, 22 Sep 2025 09:41:02 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:4631:7929:7e95:6485]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2698018167asm136546225ad.57.2025.09.22.09.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 09:41:01 -0700 (PDT) Date: Mon, 22 Sep 2025 10:40:58 -0600 From: Mathieu Poirier To: Peng Fan Cc: Bjorn Andersson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco , linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/6] remoteproc: imx_rproc: Use devm_clk_get_enabled() and simplify cleanup Message-ID: References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> <20250917-imx_rproc_c2-v1-4-00ce23dc9c6e@nxp.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250917-imx_rproc_c2-v1-4-00ce23dc9c6e@nxp.com> On Wed, Sep 17, 2025 at 09:19:16PM +0800, Peng Fan wrote: > Replace separate calls to devm_clk_get() and clk_prepare_enable() with > devm_clk_get_enabled(), which combines clock acquisition and enabling > into a single managed step. Simplify the probe logic and remove the need > for manual clock disable in error and remove paths. > > Also, update error handling to eliminate redundant cleanup steps and use > return-based error propagation where appropriate. Improve code clarity and > reduce the chance of resource leaks or incorrect ordering in cleanup paths. > > No functional changes. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/imx_rproc.c | 28 +++++++++------------------- > 1 file changed, 9 insertions(+), 19 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index e30b61ee39dacc88f9e938f8c6ffe61fef63dbda..c6cfb308ddb376f370fd4492f8a84f734602bac8 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -1006,26 +1006,19 @@ static int imx_rproc_clk_enable(struct imx_rproc *priv) > { > const struct imx_rproc_dcfg *dcfg = priv->dcfg; > struct device *dev = priv->dev; > - int ret; > > /* Remote core is not under control of Linux or it is managed by SCU API */ > if (dcfg->method == IMX_RPROC_NONE || dcfg->method == IMX_RPROC_SCU_API) > return 0; > > - priv->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(priv->clk)) { > - dev_err(dev, "Failed to get clock\n"); > - return PTR_ERR(priv->clk); > - } > - > /* > * clk for M4 block including memory. Should be > * enabled before .start for FW transfer. > */ > - ret = clk_prepare_enable(priv->clk); > - if (ret) { > + priv->clk = devm_clk_get_enabled(dev, NULL); > + if (IS_ERR(priv->clk)) { > dev_err(dev, "Failed to enable clock\n"); > - return ret; > + return PTR_ERR(priv->clk); > } > > return 0; > @@ -1134,7 +1127,7 @@ static int imx_rproc_probe(struct platform_device *pdev) > imx_rproc_sys_off_handler, rproc); > if (ret) { > dev_err(dev, "register power off handler failure\n"); > - goto err_put_clk; > + goto err_put_scu; > } > > ret = devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART_PREPARE, > @@ -1142,7 +1135,7 @@ static int imx_rproc_probe(struct platform_device *pdev) > imx_rproc_sys_off_handler, rproc); > if (ret) { > dev_err(dev, "register restart handler failure\n"); > - goto err_put_clk; > + goto err_put_scu; > } > } > > @@ -1150,32 +1143,30 @@ static int imx_rproc_probe(struct platform_device *pdev) > ret = devm_pm_runtime_enable(dev); > if (ret) { > dev_err(dev, "Failed to enable runtime PM, %d\n", ret); > - goto err_put_clk; > + goto err_put_scu; > } > > ret = pm_runtime_resume_and_get(dev); > if (ret) { > dev_err(dev, "pm_runtime get failed: %d\n", ret); > - goto err_put_clk; > + goto err_put_scu; > } > > ret = devm_add_action_or_reset(dev, imx_rproc_pm_runtime_put, dev); > if (ret) { > dev_err(dev, "Failed to add devm disable pm action: %d\n", ret); > - goto err_put_clk; > + goto err_put_scu; > } > } > > ret = rproc_add(rproc); > if (ret) { > dev_err(dev, "rproc_add failed\n"); > - goto err_put_clk; > + goto err_put_scu; > } > > return 0; > > -err_put_clk: > - clk_disable_unprepare(priv->clk); > err_put_scu: > imx_rproc_put_scu(rproc); > > @@ -1187,7 +1178,6 @@ static void imx_rproc_remove(struct platform_device *pdev) > struct rproc *rproc = platform_get_drvdata(pdev); > struct imx_rproc *priv = rproc->priv; > > - clk_disable_unprepare(priv->clk); /home/mpoirier/work/remoteproc/kernel/drivers/remoteproc/imx_rproc.c: In function ‘imx_rproc_remove’: /home/mpoirier/work/remoteproc/kernel/drivers/remoteproc/imx_rproc.c:1179:27: warning: unused variable ‘priv’ [-Wunused-variable] 1179 | struct imx_rproc *priv = rproc->priv; | ^~~~ AR drivers/remoteproc/built-in.a AR drivers/built-in.a AR kernel/module/built-in.a AR kernel/built-in.a > rproc_del(rproc); > imx_rproc_put_scu(rproc); > } > > -- > 2.37.1 >