[PATCH] usb: ehci-orion: remove optional PHY handling code remnants

[PATCH] usb: ehci-orion: remove optional PHY handling code remnants

[Gabor Juhos]

Since the USB core code handles the generic USB PHYs automatically, the
optional PHY handling code has been removed from the 'ehci-orion' driver
entirely by commit e04585184dcf ("usb: ehci-orion: avoid double PHY
initialization"). However, the devm_phy_optional_get() call has been kept
so the driver still gets the PHY even though it is not used for anything
in the driver.

Drop the remaining code, and also remove the 'phy' member of the
'orion_ehci_hcd' structure to simplify the code.

Fixes: e04585184dcf ("usb: ehci-orion: avoid double PHY initialization")
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
---
 drivers/usb/host/ehci-orion.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 34abff8669f8bf096f4547b6ce0977eb130b3c8d..eaaa49712a8c64928771eb317165091480245d0f 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -12,7 +12,6 @@
 #include <linux/clk.h>
 #include <linux/platform_data/usb-ehci-orion.h>
 #include <linux/of.h>
-#include <linux/phy/phy.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include <linux/io.h>
@@ -60,7 +59,6 @@
 
 struct orion_ehci_hcd {
 	struct clk *clk;
-	struct phy *phy;
 };
 
 static struct hc_driver __read_mostly ehci_orion_hc_driver;
@@ -276,13 +274,6 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
 			goto err_put_hcd;
 	}
 
-	priv->phy = devm_phy_optional_get(&pdev->dev, "usb");
-	if (IS_ERR(priv->phy)) {
-		err = PTR_ERR(priv->phy);
-		if (err != -ENOSYS)
-			goto err_dis_clk;
-	}
-
 	/*
 	 * (Re-)program MBUS remapping windows if we are asked to.
 	 */

---
base-commit: 2b7a25df823dc7d8f56f8ce7c2d2dac391cea9c2
change-id: 20260220-ehci-orion-drop-phy-handling-d93c15c92042

Best regards,
-- 
Gabor Juhos <j4g8y7@gmail.com>

Re: [PATCH] usb: ehci-orion: remove optional PHY handling code remnants

[Miquel Raynal]

Hi Gabor,

On 20/02/2026 at 14:27:02 +01, Gabor Juhos <j4g8y7@gmail.com> wrote:

> Since the USB core code handles the generic USB PHYs automatically, the
> optional PHY handling code has been removed from the 'ehci-orion' driver
> entirely by commit e04585184dcf ("usb: ehci-orion: avoid double PHY
> initialization"). However, the devm_phy_optional_get() call has been kept
> so the driver still gets the PHY even though it is not used for anything
> in the driver.
>
> Drop the remaining code, and also remove the 'phy' member of the
> 'orion_ehci_hcd' structure to simplify the code.
>
> Fixes: e04585184dcf ("usb: ehci-orion: avoid double PHY initialization")

The fixes tag makes no sense here, this is pure cleanup. I do not
remember if this was needed or not, it is probably safe to drop today.

Cheers,
Miquèl

Re: [PATCH] usb: ehci-orion: remove optional PHY handling code remnants

[Alan Stern]

On Fri, Feb 20, 2026 at 02:27:02PM +0100, Gabor Juhos wrote:
> Since the USB core code handles the generic USB PHYs automatically, the
> optional PHY handling code has been removed from the 'ehci-orion' driver
> entirely by commit e04585184dcf ("usb: ehci-orion: avoid double PHY
> initialization"). However, the devm_phy_optional_get() call has been kept
> so the driver still gets the PHY even though it is not used for anything
> in the driver.
> 
> Drop the remaining code, and also remove the 'phy' member of the
> 'orion_ehci_hcd' structure to simplify the code.
> 
> Fixes: e04585184dcf ("usb: ehci-orion: avoid double PHY initialization")
> Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
> ---

Acked-by: Alan Stern <stern@rowland.harvard.edu>

>  drivers/usb/host/ehci-orion.c | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
> index 34abff8669f8bf096f4547b6ce0977eb130b3c8d..eaaa49712a8c64928771eb317165091480245d0f 100644
> --- a/drivers/usb/host/ehci-orion.c
> +++ b/drivers/usb/host/ehci-orion.c
> @@ -12,7 +12,6 @@
>  #include <linux/clk.h>
>  #include <linux/platform_data/usb-ehci-orion.h>
>  #include <linux/of.h>
> -#include <linux/phy/phy.h>
>  #include <linux/usb.h>
>  #include <linux/usb/hcd.h>
>  #include <linux/io.h>
> @@ -60,7 +59,6 @@
>  
>  struct orion_ehci_hcd {
>  	struct clk *clk;
> -	struct phy *phy;
>  };
>  
>  static struct hc_driver __read_mostly ehci_orion_hc_driver;
> @@ -276,13 +274,6 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
>  			goto err_put_hcd;
>  	}
>  
> -	priv->phy = devm_phy_optional_get(&pdev->dev, "usb");
> -	if (IS_ERR(priv->phy)) {
> -		err = PTR_ERR(priv->phy);
> -		if (err != -ENOSYS)
> -			goto err_dis_clk;
> -	}
> -
>  	/*
>  	 * (Re-)program MBUS remapping windows if we are asked to.
>  	 */
> 
> ---
> base-commit: 2b7a25df823dc7d8f56f8ce7c2d2dac391cea9c2
> change-id: 20260220-ehci-orion-drop-phy-handling-d93c15c92042
> 
> Best regards,
> -- 
> Gabor Juhos <j4g8y7@gmail.com>
> 

Re: [PATCH] usb: ehci-orion: remove optional PHY handling code remnants

[Gabor Juhos]

Hi Miquel,

2026. 02. 20. 14:47 keltezéssel, Miquel Raynal írta:
> Hi Gabor,
> 
> On 20/02/2026 at 14:27:02 +01, Gabor Juhos <j4g8y7@gmail.com> wrote:
> 
>> Since the USB core code handles the generic USB PHYs automatically, the
>> optional PHY handling code has been removed from the 'ehci-orion' driver
>> entirely by commit e04585184dcf ("usb: ehci-orion: avoid double PHY
>> initialization"). However, the devm_phy_optional_get() call has been kept
>> so the driver still gets the PHY even though it is not used for anything
>> in the driver.
>>
>> Drop the remaining code, and also remove the 'phy' member of the
>> 'orion_ehci_hcd' structure to simplify the code.
>>
>> Fixes: e04585184dcf ("usb: ehci-orion: avoid double PHY initialization")
> 
> The fixes tag makes no sense here, this is pure cleanup. I do not
> remember if this was needed or not, it is probably safe to drop today.

I have checked the code in v5.1, and the phy is not used there either.
Nevertheless, you are right, this is a cleanup rather than a fix. I will send a
v2 without the Fixes tag.

Thanks,
Gabor