Revert "usb: phy: generic: Get the vbus supply"

commit fdada0db0b2ae2addef4ccafe50937874dbeeebe upstream.

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

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Fixes: 75fd6485ccce ("usb: phy: generic: Get the vbus supply")
Cc: stable <stable@kernel.org>
Reviewed-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20240314092628.1869414-1-alexander.stein@ew.tq-group.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index b855d291dfe6b909de609f78d7c71961dab6cb0a..770081b828a429326e8801981f9ec66a913b6890 100644 (file)
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -268,13 +268,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";