diff options
author | Maulik Mankad <x0082077@ti.com> | 2010-02-17 17:09:29 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-19 18:22:17 -0500 |
commit | 224e1542b6ca2d38dc0c7ea65fb6760c082b1309 (patch) | |
tree | 5179e348783af6c12d2806da21d41df7b33b8b80 | |
parent | 5ebc86eda7ebb36ee66a90a7a5bbfc948f181088 (diff) |
USB: Add empty functions in otg.h
Add empty functions for usb_nop_xceiv_register()
and usb_nop_xceiv_unregister() in otg.h so that
these functions can be called even when
CONFIG_NOP_USB_XCEIV is not enabled.
It allows to remove ifdef's from board file.
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | include/linux/usb/otg.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 52bb917641f0..fef0972c8146 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h | |||
@@ -110,9 +110,19 @@ struct otg_transceiver { | |||
110 | /* for board-specific init logic */ | 110 | /* for board-specific init logic */ |
111 | extern int otg_set_transceiver(struct otg_transceiver *); | 111 | extern int otg_set_transceiver(struct otg_transceiver *); |
112 | 112 | ||
113 | #if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE) | ||
113 | /* sometimes transceivers are accessed only through e.g. ULPI */ | 114 | /* sometimes transceivers are accessed only through e.g. ULPI */ |
114 | extern void usb_nop_xceiv_register(void); | 115 | extern void usb_nop_xceiv_register(void); |
115 | extern void usb_nop_xceiv_unregister(void); | 116 | extern void usb_nop_xceiv_unregister(void); |
117 | #else | ||
118 | static inline void usb_nop_xceiv_register(void) | ||
119 | { | ||
120 | } | ||
121 | |||
122 | static inline void usb_nop_xceiv_unregister(void) | ||
123 | { | ||
124 | } | ||
125 | #endif | ||
116 | 126 | ||
117 | /* helpers for direct access thru low-level io interface */ | 127 | /* helpers for direct access thru low-level io interface */ |
118 | static inline int otg_io_read(struct otg_transceiver *otg, u32 reg) | 128 | static inline int otg_io_read(struct otg_transceiver *otg, u32 reg) |