Message ID | 20250410133332.294556-7-linux.amoon@gmail.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | Messon: Simplify error handling with dev_err_probe() | expand |
On 10/04/2025 15:33, Anand Moon wrote: > Reorder the PHY creation in the axg-pcie probe function to ensure all > the resource is mapped before creating the PHY. This change addresses > the issue where the PHY creation was attempted before > mapping the necessary resources, potentially causing failures. > > Signed-off-by: Anand Moon <linux.amoon@gmail.com> > --- > drivers/phy/amlogic/phy-meson-axg-pcie.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c > index 54baf7b8930e1..14dee73f9cb57 100644 > --- a/drivers/phy/amlogic/phy-meson-axg-pcie.c > +++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c > @@ -136,11 +136,6 @@ static int phy_axg_pcie_probe(struct platform_device *pdev) > if (!priv) > return -ENOMEM; > > - priv->phy = devm_phy_create(dev, np, &phy_axg_pcie_ops); > - if (IS_ERR(priv->phy)) > - return dev_err_probe(dev, PTR_ERR(priv->phy), > - "failed to create PHY\n"); > - > base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(base)) > return PTR_ERR(base); > @@ -158,6 +153,11 @@ static int phy_axg_pcie_probe(struct platform_device *pdev) > if (IS_ERR(priv->analog)) > return PTR_ERR(priv->analog); > > + priv->phy = devm_phy_create(dev, np, &phy_axg_pcie_ops); > + if (IS_ERR(priv->phy)) > + return dev_err_probe(dev, PTR_ERR(priv->phy), > + "failed to create PHY\n"); > + > phy_set_drvdata(priv->phy, priv); > dev_set_drvdata(dev, priv); > pphy = devm_of_phy_provider_register(dev, of_phy_simple_xlate); Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c index 54baf7b8930e1..14dee73f9cb57 100644 --- a/drivers/phy/amlogic/phy-meson-axg-pcie.c +++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c @@ -136,11 +136,6 @@ static int phy_axg_pcie_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->phy = devm_phy_create(dev, np, &phy_axg_pcie_ops); - if (IS_ERR(priv->phy)) - return dev_err_probe(dev, PTR_ERR(priv->phy), - "failed to create PHY\n"); - base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); @@ -158,6 +153,11 @@ static int phy_axg_pcie_probe(struct platform_device *pdev) if (IS_ERR(priv->analog)) return PTR_ERR(priv->analog); + priv->phy = devm_phy_create(dev, np, &phy_axg_pcie_ops); + if (IS_ERR(priv->phy)) + return dev_err_probe(dev, PTR_ERR(priv->phy), + "failed to create PHY\n"); + phy_set_drvdata(priv->phy, priv); dev_set_drvdata(dev, priv); pphy = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
Reorder the PHY creation in the axg-pcie probe function to ensure all the resource is mapped before creating the PHY. This change addresses the issue where the PHY creation was attempted before mapping the necessary resources, potentially causing failures. Signed-off-by: Anand Moon <linux.amoon@gmail.com> --- drivers/phy/amlogic/phy-meson-axg-pcie.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)