Revert "usb: phy: generic: Get the vbus supply"
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Thu, 14 Mar 2024 09:26:27 +0000 (10:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2024 13:57:22 +0000 (14:57 +0100)
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>
drivers/usb/phy/phy-generic.c

index 8f735a86cd197275480ef69145ef0dee9f739a27..fdcffebf415cda91f0c65bd9a048f0a8a988da15 100644 (file)
@@ -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";