diff options
| author | Antoine Tenart <antoine.tenart@free-electrons.com> | 2014-10-30 18:41:14 +0100 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-04-14 14:01:34 -0500 |
| commit | 9e3cdf69b3ab961df585bbb102e619d7b83ad013 (patch) | |
| tree | 8c4fd83942ff7182787e02b8465880341a3e83b2 /include/linux | |
| parent | b118df21745930f9834cfe795daa2cfef57bb5eb (diff) | |
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>
(cherry picked from commit 19c1eac2685b62640ca2386a0a885ac2152668c8)
Conflicts:
drivers/phy/phy-omap-usb2.c
drivers/usb/phy/phy-msm-usb.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/otg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 33d3480c9cda..978fbbb0e266 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -14,7 +14,7 @@ struct usb_otg { u8 default_a; - struct usb_phy *phy; + struct usb_phy *usb_phy; struct usb_bus *host; struct usb_gadget *gadget; |