| Message ID | 20240822084400.1595426-1-frank.li@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] phy: ti: phy-dm816x-usb: Convert to devm_clk_get_prepared() | expand |
On 22-08-24, 02:44, Yangtao Li wrote: > Convert devm_clk_get(), clk_prepare_enable() to a single > call to devm_clk_get_enabled(), as this is exactly > what this function does. Can you please resend this as a single thread. Threading is broken in this series, I see 2, 3 patches, no idea where 1, 4 are... > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 22 ++++---------------- > 1 file changed, 4 insertions(+), 18 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c b/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c > index 3642a5d4f2f3..18c0dbd8e707 100644 > --- a/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c > +++ b/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c > @@ -68,7 +68,6 @@ > > struct qcom_apq8064_sata_phy { > void __iomem *mmio; > - struct clk *cfg_clk; > struct device *dev; > }; > > @@ -203,7 +202,7 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct phy_provider *phy_provider; > struct phy *generic_phy; > - int ret; > + struct clk *cfg_clk; > > phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL); > if (!phy) > @@ -223,19 +222,14 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) > phy_set_drvdata(generic_phy, phy); > platform_set_drvdata(pdev, phy); > > - phy->cfg_clk = devm_clk_get(dev, "cfg"); > - if (IS_ERR(phy->cfg_clk)) { > + cfg_clk = devm_clk_get_enabled(dev, "cfg"); > + if (IS_ERR(cfg_clk)) { > dev_err(dev, "Failed to get sata cfg clock\n"); > - return PTR_ERR(phy->cfg_clk); > + return PTR_ERR(cfg_clk); > } > > - ret = clk_prepare_enable(phy->cfg_clk); > - if (ret) > - return ret; > - > phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); > if (IS_ERR(phy_provider)) { > - clk_disable_unprepare(phy->cfg_clk); > dev_err(dev, "%s: failed to register phy\n", __func__); > return PTR_ERR(phy_provider); > } > @@ -243,13 +237,6 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) > return 0; > } > > -static void qcom_apq8064_sata_phy_remove(struct platform_device *pdev) > -{ > - struct qcom_apq8064_sata_phy *phy = platform_get_drvdata(pdev); > - > - clk_disable_unprepare(phy->cfg_clk); > -} > - > static const struct of_device_id qcom_apq8064_sata_phy_of_match[] = { > { .compatible = "qcom,apq8064-sata-phy" }, > { }, > @@ -258,7 +245,6 @@ MODULE_DEVICE_TABLE(of, qcom_apq8064_sata_phy_of_match); > > static struct platform_driver qcom_apq8064_sata_phy_driver = { > .probe = qcom_apq8064_sata_phy_probe, > - .remove_new = qcom_apq8064_sata_phy_remove, > .driver = { > .name = "qcom-apq8064-sata-phy", > .of_match_table = qcom_apq8064_sata_phy_of_match, > -- > 2.39.0
diff --git a/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c b/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c index 3642a5d4f2f3..18c0dbd8e707 100644 --- a/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c +++ b/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c @@ -68,7 +68,6 @@ struct qcom_apq8064_sata_phy { void __iomem *mmio; - struct clk *cfg_clk; struct device *dev; }; @@ -203,7 +202,7 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct phy_provider *phy_provider; struct phy *generic_phy; - int ret; + struct clk *cfg_clk; phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL); if (!phy) @@ -223,19 +222,14 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) phy_set_drvdata(generic_phy, phy); platform_set_drvdata(pdev, phy); - phy->cfg_clk = devm_clk_get(dev, "cfg"); - if (IS_ERR(phy->cfg_clk)) { + cfg_clk = devm_clk_get_enabled(dev, "cfg"); + if (IS_ERR(cfg_clk)) { dev_err(dev, "Failed to get sata cfg clock\n"); - return PTR_ERR(phy->cfg_clk); + return PTR_ERR(cfg_clk); } - ret = clk_prepare_enable(phy->cfg_clk); - if (ret) - return ret; - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); if (IS_ERR(phy_provider)) { - clk_disable_unprepare(phy->cfg_clk); dev_err(dev, "%s: failed to register phy\n", __func__); return PTR_ERR(phy_provider); } @@ -243,13 +237,6 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) return 0; } -static void qcom_apq8064_sata_phy_remove(struct platform_device *pdev) -{ - struct qcom_apq8064_sata_phy *phy = platform_get_drvdata(pdev); - - clk_disable_unprepare(phy->cfg_clk); -} - static const struct of_device_id qcom_apq8064_sata_phy_of_match[] = { { .compatible = "qcom,apq8064-sata-phy" }, { }, @@ -258,7 +245,6 @@ MODULE_DEVICE_TABLE(of, qcom_apq8064_sata_phy_of_match); static struct platform_driver qcom_apq8064_sata_phy_driver = { .probe = qcom_apq8064_sata_phy_probe, - .remove_new = qcom_apq8064_sata_phy_remove, .driver = { .name = "qcom-apq8064-sata-phy", .of_match_table = qcom_apq8064_sata_phy_of_match,
Convert devm_clk_get(), clk_prepare_enable() to a single call to devm_clk_get_enabled(), as this is exactly what this function does. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 22 ++++---------------- 1 file changed, 4 insertions(+), 18 deletions(-)