2024-03-14 09:26:57

by Alexander Stein

Subject: [PATCH 1/1 usb-next] Revert "usb: phy: generic: Get the vbus supply"

This reverts commit 75fd6485cccef269ac9eb3b71cf56753341195ef.
This patch was applied twice by accident, causing probe failures.
Revert the accident.

Signed-off-by: Alexander Stein <[email protected]>
---
See [1] for details. This applies only to usb-next.

[1] https://lore.kernel.org/linux-usb/3469745.QJadu78ljV@steina-w/

drivers/usb/phy/phy-generic.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 8f735a86cd19..fdcffebf415c 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -262,13 +262,6 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop)
return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
"could not get vbus regulator\n");

- nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
- if (PTR_ERR(nop->vbus_draw) == -ENODEV)
- nop->vbus_draw = NULL;
- if (IS_ERR(nop->vbus_draw))
- return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
- "could not get vbus regulator\n");
-
nop->dev = dev;
nop->phy.dev = nop->dev;
nop->phy.label = "nop-xceiv";
--
2.34.1

2024-03-14 16:23:25

by Sean Anderson

Subject: Re: [PATCH 1/1 usb-next] Revert "usb: phy: generic: Get the vbus supply"

On 3/14/24 05:26, Alexander Stein wrote:
> This reverts commit 75fd6485cccef269ac9eb3b71cf56753341195ef.
> This patch was applied twice by accident, causing probe failures.
> Revert the accident.
>
> Signed-off-by: Alexander Stein <[email protected]>
> ---
> See [1] for details. This applies only to usb-next.
>
> [1] https://cas5-0-urlprotect.trendmicro.com:443/wis/clicktime/v1/query?url=https%3a%2f%2flore.kernel.org%2flinux%2dusb%2f3469745.QJadu78ljV%40steina%2dw%2f&umid=6ce55218-6f2d-4fef-81fd-77cdf23523ad&auth=d807158c60b7d2502abde8a2fc01f40662980862-4b6d276f4d42a6c6c8fc7d375bba2e12c5da85fa
>
> drivers/usb/phy/phy-generic.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
> index 8f735a86cd19..fdcffebf415c 100644
> --- a/drivers/usb/phy/phy-generic.c
> +++ b/drivers/usb/phy/phy-generic.c
> @@ -262,13 +262,6 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop)
> return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
> "could not get vbus regulator\n");
>
> - nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
> - if (PTR_ERR(nop->vbus_draw) == -ENODEV)
> - nop->vbus_draw = NULL;
> - if (IS_ERR(nop->vbus_draw))
> - return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
> - "could not get vbus regulator\n");
> -
> nop->dev = dev;
> nop->phy.dev = nop->dev;
> nop->phy.label = "nop-xceiv";

Reviewed-by: Sean Anderson <[email protected]>

[Embedded World 2024, SECO SpA]<https://www.messe-ticket.de/Nuernberg/embeddedworld2024/Register/ew24517689>