diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-07-19 06:32:15 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-08-03 02:36:18 -0400 |
| commit | 78c289f8769aaefcc52d26ca53c8b2ee545fb332 (patch) | |
| tree | c62a9458f5dde02d87242e449afc05e1c9093b52 /include/linux | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
usb: xceiv: create nop-usb-xceiv.h and avoid pollution on otg.h
nop-usb-xceiv was polluting otg.h with its own
function prototypes. Move those prototypes to
a nop-usb-xceiv.h header.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/nop-usb-xceiv.h | 18 | ||||
| -rw-r--r-- | include/linux/usb/otg.h | 14 |
2 files changed, 18 insertions, 14 deletions
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/nop-usb-xceiv.h new file mode 100644 index 000000000000..ecc7562a38cc --- /dev/null +++ b/include/linux/usb/nop-usb-xceiv.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | #ifndef __LINUX_USB_NOP_XCEIV_H | ||
| 2 | #define __LINUX_USB_NOP_XCEIV_H | ||
| 3 | |||
| 4 | #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) | ||
| 5 | /* sometimes transceivers are accessed only through e.g. ULPI */ | ||
| 6 | extern void usb_nop_xceiv_register(void); | ||
| 7 | extern void usb_nop_xceiv_unregister(void); | ||
| 8 | #else | ||
| 9 | static inline void usb_nop_xceiv_register(void) | ||
| 10 | { | ||
| 11 | } | ||
| 12 | |||
| 13 | static inline void usb_nop_xceiv_unregister(void) | ||
| 14 | { | ||
| 15 | } | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #endif /* __LINUX_USB_NOP_XCEIV_H */ | ||
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 45824be0a2f9..16dc520dfbad 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h | |||
| @@ -138,20 +138,6 @@ struct usb_phy { | |||
| 138 | extern int usb_add_phy(struct usb_phy *, enum usb_phy_type type); | 138 | extern int usb_add_phy(struct usb_phy *, enum usb_phy_type type); |
| 139 | extern void usb_remove_phy(struct usb_phy *); | 139 | extern void usb_remove_phy(struct usb_phy *); |
| 140 | 140 | ||
| 141 | #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) | ||
| 142 | /* sometimes transceivers are accessed only through e.g. ULPI */ | ||
| 143 | extern void usb_nop_xceiv_register(void); | ||
| 144 | extern void usb_nop_xceiv_unregister(void); | ||
| 145 | #else | ||
| 146 | static inline void usb_nop_xceiv_register(void) | ||
| 147 | { | ||
| 148 | } | ||
| 149 | |||
| 150 | static inline void usb_nop_xceiv_unregister(void) | ||
| 151 | { | ||
| 152 | } | ||
| 153 | #endif | ||
| 154 | |||
| 155 | /* helpers for direct access thru low-level io interface */ | 141 | /* helpers for direct access thru low-level io interface */ |
| 156 | static inline int usb_phy_io_read(struct usb_phy *x, u32 reg) | 142 | static inline int usb_phy_io_read(struct usb_phy *x, u32 reg) |
| 157 | { | 143 | { |
