From nobody Fri Dec 19 15:01:59 2025 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B453213AA4C for ; Mon, 26 Aug 2024 07:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724658984; cv=none; b=IrnyID7V1X1JgGcGfb/ybUvI1ftGUnRLymCTdU3ouSa+F0xtfo9BHqzfiNarIMgAucjBm6261rW9e1BynGfFKXmdfw6oNwQzHpDUXjBkw41zEq6X5cxvpGdOQkVx/oKOov2Oin2yHj8exIWu+oGE4JVP5WyY6twVeAvdTMzkiw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724658984; c=relaxed/simple; bh=yl2J7lxhc61TQUz0GPf28a5fKqHnTpQ4Z0kdUH6ewNQ=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=U9CvTO6VMyBCtG8Lh/OUkXLzbByb0I6i5ixXU0mDitAw3Sbj/5GhBdtTiN6vKXuUAC9UiozGrM5d0Li41MZ7jy1n5FGENur5FHVjwrVzyrZcpbHACyxpPMRW7D9u/uYa1IP76QBEQdEN4eotQJgVGLr3MoQstURhwnXtQb4t9YY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4WsjYH4HlYz20mg2; Mon, 26 Aug 2024 15:51:31 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 97E4F140120; Mon, 26 Aug 2024 15:56:18 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 26 Aug 2024 15:56:18 +0800 From: Jinjie Ruan To: , , , , CC: Subject: [PATCH -next] mtd: rawnand: denali: Use the devm_clk_get_enabled() helper function Date: Mon, 26 Aug 2024 16:04:08 +0800 Message-ID: <20240826080408.2522978-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code. Signed-off-by: Jinjie Ruan --- drivers/mtd/nand/raw/denali_dt.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali= _dt.c index edac8749bb93..2f5666511fda 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -145,15 +145,15 @@ static int denali_dt_probe(struct platform_device *pd= ev) if (IS_ERR(denali->host)) return PTR_ERR(denali->host); =20 - dt->clk =3D devm_clk_get(dev, "nand"); + dt->clk =3D devm_clk_get_enabled(dev, "nand"); if (IS_ERR(dt->clk)) return PTR_ERR(dt->clk); =20 - dt->clk_x =3D devm_clk_get(dev, "nand_x"); + dt->clk_x =3D devm_clk_get_enabled(dev, "nand_x"); if (IS_ERR(dt->clk_x)) return PTR_ERR(dt->clk_x); =20 - dt->clk_ecc =3D devm_clk_get(dev, "ecc"); + dt->clk_ecc =3D devm_clk_get_enabled(dev, "ecc"); if (IS_ERR(dt->clk_ecc)) return PTR_ERR(dt->clk_ecc); =20 @@ -165,18 +165,6 @@ static int denali_dt_probe(struct platform_device *pde= v) if (IS_ERR(dt->rst_reg)) return PTR_ERR(dt->rst_reg); =20 - ret =3D clk_prepare_enable(dt->clk); - if (ret) - return ret; - - ret =3D clk_prepare_enable(dt->clk_x); - if (ret) - goto out_disable_clk; - - ret =3D clk_prepare_enable(dt->clk_ecc); - if (ret) - goto out_disable_clk_x; - denali->clk_rate =3D clk_get_rate(dt->clk); denali->clk_x_rate =3D clk_get_rate(dt->clk_x); =20 @@ -187,7 +175,7 @@ static int denali_dt_probe(struct platform_device *pdev) */ ret =3D reset_control_deassert(dt->rst_reg); if (ret) - goto out_disable_clk_ecc; + return ret; =20 ret =3D reset_control_deassert(dt->rst); if (ret) @@ -222,12 +210,6 @@ static int denali_dt_probe(struct platform_device *pde= v) reset_control_assert(dt->rst); out_assert_rst_reg: reset_control_assert(dt->rst_reg); -out_disable_clk_ecc: - clk_disable_unprepare(dt->clk_ecc); -out_disable_clk_x: - clk_disable_unprepare(dt->clk_x); -out_disable_clk: - clk_disable_unprepare(dt->clk); =20 return ret; } @@ -239,9 +221,6 @@ static void denali_dt_remove(struct platform_device *pd= ev) denali_remove(&dt->controller); reset_control_assert(dt->rst); reset_control_assert(dt->rst_reg); - clk_disable_unprepare(dt->clk_ecc); - clk_disable_unprepare(dt->clk_x); - clk_disable_unprepare(dt->clk); } =20 static struct platform_driver denali_dt_driver =3D { --=20 2.34.1