From nobody Mon Dec 1 21:29:47 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 6BDD9335556 for ; Mon, 1 Dec 2025 17:12:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764609135; cv=none; b=Jc9txyVkM7pTM2XdKcNqfOGkTFraQl3ZCZBZSBQqS1eNdrarPJjlUE/nppOdummph84jg5zftAZZxPLS0dO1NWqciuyLsf1x8D/Dv9af7dY7caelzpBQgpb7d7mif4kY5heWVPMoABVIh71k+4uA9LwHm79lPmVxUF2EJq50yo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764609135; c=relaxed/simple; bh=3UebCuYz5xGW6Q3uKUWSuaCckT5JCsx8BsMRxukQRGw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YahFSKP2T8jFC9EwyaqXyknc7Yr0rGF77VU1EbMub5PS6J24e1/ZK/Ap73IB6v1EHJoP4WBcK0XXq4Y8reHO60sw98j+LswHaAMdOg2diaCyMuW2h5W71P6zy0jNwPtBzCjEI/xw1M+YOT1Ve9PXglY2p44gUwVzRo9Ger/EXxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQ7RX-0002dz-DS; Mon, 01 Dec 2025 18:12:07 +0100 From: Marco Felsch Date: Mon, 01 Dec 2025 18:12:06 +0100 Subject: [PATCH 2/3] pmdomain: imx93-blk-ctrl: convert to devm_* only Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-v6-18-topic-imx93-blkctrl-v1-2-b57a72e60105@pengutronix.de> References: <20251201-v6-18-topic-imx93-blkctrl-v1-0-b57a72e60105@pengutronix.de> In-Reply-To: <20251201-v6-18-topic-imx93-blkctrl-v1-0-b57a72e60105@pengutronix.de> To: Ulf Hansson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-pm@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marco Felsch X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Some APIs used by this driver don't have devm_ helpers yet. Instead of using the devm_add_action_or_reset() the current driver is based on hand crafted error goto paths and a .remove() callback. Convert the driver to devm_ APIs only by making use of devm_add_action_or_reset() and devm_pm_runtime_enable() to simplify the release and error path. Signed-off-by: Marco Felsch --- drivers/pmdomain/imx/imx93-blk-ctrl.c | 64 +++++++++++++++----------------= ---- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/drivers/pmdomain/imx/imx93-blk-ctrl.c b/drivers/pmdomain/imx/i= mx93-blk-ctrl.c index 2aa163aef8de4ee901b9cde76ce2aad246c8c08a..13b0de6dd689cf944e034f7666a= 4e97b0118e3bd 100644 --- a/drivers/pmdomain/imx/imx93-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx93-blk-ctrl.c @@ -188,6 +188,20 @@ static int imx93_blk_ctrl_power_off(struct generic_pm_= domain *genpd) return 0; } =20 +static void imx93_release_genpd_provider(void *data) +{ + struct device_node *of_node =3D data; + + of_genpd_del_provider(of_node); +} + +static void imx93_release_pm_genpd(void *data) +{ + struct generic_pm_domain *genpd =3D data; + + pm_genpd_remove(genpd); +} + static struct lock_class_key blk_ctrl_genpd_lock_class; =20 static int imx93_blk_ctrl_probe(struct platform_device *pdev) @@ -256,10 +270,8 @@ static int imx93_blk_ctrl_probe(struct platform_device= *pdev) domain->clks[j].id =3D data->clk_names[j]; =20 ret =3D devm_clk_bulk_get(dev, data->num_clks, domain->clks); - if (ret) { - dev_err_probe(dev, ret, "failed to get clock\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to get clock\n"); =20 domain->genpd.name =3D data->name; domain->genpd.power_on =3D imx93_blk_ctrl_power_on; @@ -267,11 +279,12 @@ static int imx93_blk_ctrl_probe(struct platform_devic= e *pdev) domain->bc =3D bc; =20 ret =3D pm_genpd_init(&domain->genpd, NULL, true); - if (ret) { - dev_err_probe(dev, ret, "failed to init power domain\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to init power domain\n"); =20 + ret =3D devm_add_action_or_reset(dev, imx93_release_pm_genpd, &domain->g= enpd); + if (ret) + return dev_err_probe(dev, ret, "failed to add pm_genpd release callback= \n"); /* * We use runtime PM to trigger power on/off of the upstream GPC * domain, as a strict hierarchical parent/child power domain @@ -288,39 +301,17 @@ static int imx93_blk_ctrl_probe(struct platform_devic= e *pdev) bc->onecell_data.domains[i] =3D &domain->genpd; } =20 - pm_runtime_enable(dev); + devm_pm_runtime_enable(dev); =20 ret =3D of_genpd_add_provider_onecell(dev->of_node, &bc->onecell_data); - if (ret) { - dev_err_probe(dev, ret, "failed to add power domain provider\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to add power domain provider\n"); =20 - dev_set_drvdata(dev, bc); + ret =3D devm_add_action_or_reset(dev, imx93_release_genpd_provider, dev->= of_node); + if (ret) + return dev_err_probe(dev, ret, "failed to add genpd_provider release cal= lback\n"); =20 return 0; - -cleanup_pds: - for (i--; i >=3D 0; i--) - pm_genpd_remove(&bc->domains[i].genpd); - - return ret; -} - -static void imx93_blk_ctrl_remove(struct platform_device *pdev) -{ - struct imx93_blk_ctrl *bc =3D dev_get_drvdata(&pdev->dev); - int i; - - of_genpd_del_provider(pdev->dev.of_node); - - pm_runtime_disable(&pdev->dev); - - for (i =3D 0; i < bc->onecell_data.num_domains; i++) { - struct imx93_blk_ctrl_domain *domain =3D &bc->domains[i]; - - pm_genpd_remove(&domain->genpd); - } } =20 static const struct imx93_blk_ctrl_domain_data imx93_media_blk_ctl_domain_= data[] =3D { @@ -455,7 +446,6 @@ MODULE_DEVICE_TABLE(of, imx93_blk_ctrl_of_match); =20 static struct platform_driver imx93_blk_ctrl_driver =3D { .probe =3D imx93_blk_ctrl_probe, - .remove =3D imx93_blk_ctrl_remove, .driver =3D { .name =3D "imx93-blk-ctrl", .of_match_table =3D imx93_blk_ctrl_of_match, --=20 2.47.3