diff options
| author | Antoine Tenart <antoine.tenart@free-electrons.com> | 2014-10-30 18:41:14 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-11-03 10:01:25 -0600 |
| commit | 19c1eac2685b62640ca2386a0a885ac2152668c8 (patch) | |
| tree | e53fc8ad677eb36411e92823675b042e432bda4f /drivers/phy/phy-omap-usb2.c | |
| parent | e47d92545c2972bcf3711e7db80f481e402163c7 (diff) | |
| download | op-kernel-dev-19c1eac2685b62640ca2386a0a885ac2152668c8.zip op-kernel-dev-19c1eac2685b62640ca2386a0a885ac2152668c8.tar.gz | |
usb: rename phy to usb_phy in OTG
This patch prepares the introduction of the generic PHY support in the
USB OTG common functions. The USB PHY member of the OTG structure is
renamed to 'usb_phy' and modifications are done in all drivers accessing
it. Renaming this pointer will allow to keep the compatibility for USB
PHY drivers.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/phy/phy-omap-usb2.c')
| -rw-r--r-- | drivers/phy/phy-omap-usb2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index 9f409359..32c3e86 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -60,7 +60,7 @@ EXPORT_SYMBOL_GPL(omap_usb2_set_comparator); static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled) { - struct omap_usb *phy = phy_to_omapusb(otg->phy); + struct omap_usb *phy = phy_to_omapusb(otg->usb_phy); if (!phy->comparator) return -ENODEV; @@ -70,7 +70,7 @@ static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled) static int omap_usb_start_srp(struct usb_otg *otg) { - struct omap_usb *phy = phy_to_omapusb(otg->phy); + struct omap_usb *phy = phy_to_omapusb(otg->usb_phy); if (!phy->comparator) return -ENODEV; @@ -251,7 +251,7 @@ static int omap_usb2_probe(struct platform_device *pdev) otg->set_vbus = omap_usb_set_vbus; if (phy_data->flags & OMAP_USB2_HAS_START_SRP) otg->start_srp = omap_usb_start_srp; - otg->phy = &phy->phy; + otg->usb_phy = &phy->phy; platform_set_drvdata(pdev, phy); |
