From nobody Mon Apr 13 15:47:42 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1075C433FE for ; Mon, 14 Nov 2022 11:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236565AbiKNLIL (ORCPT ); Mon, 14 Nov 2022 06:08:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236649AbiKNLH2 (ORCPT ); Mon, 14 Nov 2022 06:07:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5ADB61EEE6; Mon, 14 Nov 2022 03:07:17 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D141A61031; Mon, 14 Nov 2022 11:07:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 290FFC4FF6E; Mon, 14 Nov 2022 11:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668424035; bh=CrTIV+RLoOEUxG/kskgtip682WH0/tx5ssc28Evx46I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kdkihBmxAsUlVbmCpQsXWOOaK31FJapumWs4eC5lHgdPBFMEkuqaswqovWy9nUCJy 9IkIr+nkZaeV8f3khasmv2FV9S2t4GpGi4M0aAXmNssPxASG/ezmkTxJMmcm0e7IAZ 5n6FyKj5i+npf8FIEAm3dd/VpmQEmd7qwTtkCNR1BcEZibo4tcaoIW3Snvec5ZQSWG KwY05x/hNe363zbDMLTGYX3zNz9eoO8MJ69zY6/8llNzOTdcLHWw0i+Iyv2HW+QbdR gxAbT37GpaVaCRt07+5Dry0aIYjVK+jalYbbbcmUZt57IWP6QxcjosnyvUBYuN/s2J QdmZAtRyOilvA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1ouXIZ-0001FO-JJ; Mon, 14 Nov 2022 12:06:43 +0100 From: Johan Hovold To: Vinod Koul Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 21/22] phy: qcom-qmp-combo: clean up probe initialisation Date: Mon, 14 Nov 2022 12:06:20 +0100 Message-Id: <20221114110621.4639-22-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221114110621.4639-1-johan+linaro@kernel.org> References: <20221114110621.4639-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Stop abusing the driver data pointer and instead pass the driver state structure directly to the initialisation helpers during probe. Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 61 ++++++++++------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualco= mm/phy-qcom-qmp-combo.c index 9eacbd224012..5d92cbfc458e 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2148,9 +2148,10 @@ static const struct dev_pm_ops qmp_combo_pm_ops =3D { qmp_combo_runtime_resume, NULL) }; =20 -static int qmp_combo_vreg_init(struct device *dev, const struct qmp_phy_cf= g *cfg) +static int qmp_combo_vreg_init(struct qmp_combo *qmp) { - struct qmp_combo *qmp =3D dev_get_drvdata(dev); + const struct qmp_phy_cfg *cfg =3D qmp->cfg; + struct device *dev =3D qmp->dev; int num =3D cfg->num_vregs; int ret, i; =20 @@ -2180,9 +2181,10 @@ static int qmp_combo_vreg_init(struct device *dev, c= onst struct qmp_phy_cfg *cfg return 0; } =20 -static int qmp_combo_reset_init(struct device *dev, const struct qmp_phy_c= fg *cfg) +static int qmp_combo_reset_init(struct qmp_combo *qmp) { - struct qmp_combo *qmp =3D dev_get_drvdata(dev); + const struct qmp_phy_cfg *cfg =3D qmp->cfg; + struct device *dev =3D qmp->dev; int i; int ret; =20 @@ -2201,9 +2203,10 @@ static int qmp_combo_reset_init(struct device *dev, = const struct qmp_phy_cfg *cf return 0; } =20 -static int qmp_combo_clk_init(struct device *dev, const struct qmp_phy_cfg= *cfg) +static int qmp_combo_clk_init(struct qmp_combo *qmp) { - struct qmp_combo *qmp =3D dev_get_drvdata(dev); + const struct qmp_phy_cfg *cfg =3D qmp->cfg; + struct device *dev =3D qmp->dev; int num =3D cfg->num_clks; int i; =20 @@ -2468,15 +2471,12 @@ static int phy_dp_clks_register(struct qmp_combo *q= mp, struct device_node *np) return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np); } =20 -static int qmp_combo_create_dp(struct device *dev, struct device_node *np, - void __iomem *serdes, const struct qmp_phy_cfg *cfg) +static int qmp_combo_create_dp(struct qmp_combo *qmp, struct device_node *= np) { - struct qmp_combo *qmp =3D dev_get_drvdata(dev); + struct device *dev =3D qmp->dev; struct phy *generic_phy; int ret; =20 - qmp->cfg =3D cfg; - qmp->dp_serdes =3D serdes; /* * Get memory resources from the DP child node: * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2; @@ -2509,15 +2509,13 @@ static int qmp_combo_create_dp(struct device *dev, = struct device_node *np, return 0; } =20 -static int qmp_combo_create_usb(struct device *dev, struct device_node *np, - void __iomem *serdes, const struct qmp_phy_cfg *cfg) +static int qmp_combo_create_usb(struct qmp_combo *qmp, struct device_node = *np) { - struct qmp_combo *qmp =3D dev_get_drvdata(dev); + const struct qmp_phy_cfg *cfg =3D qmp->cfg; + struct device *dev =3D qmp->dev; struct phy *generic_phy; int ret; =20 - qmp->cfg =3D cfg; - qmp->serdes =3D serdes; /* * Get memory resources from the USB child node: * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2; @@ -2577,10 +2575,6 @@ static int qmp_combo_probe(struct platform_device *p= dev) struct device *dev =3D &pdev->dev; struct device_node *dp_np, *usb_np; struct phy_provider *phy_provider; - void __iomem *serdes; - void __iomem *usb_serdes; - void __iomem *dp_serdes =3D NULL; - const struct qmp_phy_cfg *cfg =3D NULL; int ret; =20 qmp =3D devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL); @@ -2588,35 +2582,34 @@ static int qmp_combo_probe(struct platform_device *= pdev) return -ENOMEM; =20 qmp->dev =3D dev; - dev_set_drvdata(dev, qmp); =20 - cfg =3D of_device_get_match_data(dev); - if (!cfg) + qmp->cfg =3D of_device_get_match_data(dev); + if (!qmp->cfg) return -EINVAL; =20 - usb_serdes =3D serdes =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(serdes)) - return PTR_ERR(serdes); + qmp->serdes =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(qmp->serdes)) + return PTR_ERR(qmp->serdes); =20 qmp->dp_com =3D devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(qmp->dp_com)) return PTR_ERR(qmp->dp_com); =20 - dp_serdes =3D devm_platform_ioremap_resource(pdev, 2); - if (IS_ERR(dp_serdes)) - return PTR_ERR(dp_serdes); + qmp->dp_serdes =3D devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(qmp->dp_serdes)) + return PTR_ERR(qmp->dp_serdes); =20 mutex_init(&qmp->phy_mutex); =20 - ret =3D qmp_combo_clk_init(dev, cfg); + ret =3D qmp_combo_clk_init(qmp); if (ret) return ret; =20 - ret =3D qmp_combo_reset_init(dev, cfg); + ret =3D qmp_combo_reset_init(qmp); if (ret) return ret; =20 - ret =3D qmp_combo_vreg_init(dev, cfg); + ret =3D qmp_combo_vreg_init(qmp); if (ret) return ret; =20 @@ -2640,7 +2633,7 @@ static int qmp_combo_probe(struct platform_device *pd= ev) */ pm_runtime_forbid(dev); =20 - ret =3D qmp_combo_create_usb(dev, usb_np, usb_serdes, cfg); + ret =3D qmp_combo_create_usb(qmp, usb_np); if (ret) goto err_node_put; =20 @@ -2648,7 +2641,7 @@ static int qmp_combo_probe(struct platform_device *pd= ev) if (ret) goto err_node_put; =20 - ret =3D qmp_combo_create_dp(dev, dp_np, dp_serdes, cfg); + ret =3D qmp_combo_create_dp(qmp, dp_np); if (ret) goto err_node_put; =20 --=20 2.37.4