[PATCH 2/2] ARM : OMAP : Add empty function in header file

[PATCH 2/2] ARM : OMAP : Add empty function in header file

[Maulik Mankad]

ARM : OMAP : Add empty function in header file

This patch adds empty functions for usb_nop_xceiv_register()
and usb_nop_xceiv_unregister() 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: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Olof Johansson <olof@lixom.net>
---
Index: felipe_musb/include/linux/usb/otg.h
===================================================================
--- felipe_musb.orig/include/linux/usb/otg.h
+++ felipe_musb/include/linux/usb/otg.h
@@ -110,9 +110,14 @@ struct otg_transceiver {
 /* for board-specific init logic */
 extern int otg_set_transceiver(struct otg_transceiver *);
 
+#if defined(CONFIG_USB) || defined(CONFIG_USB_GADGET)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
+#else
+#define usb_nop_xceiv_register()	do {} while (0)
+#define usb_nop_xceiv_unregister()	do {} while (0)
+#endif
 
 /* helpers for direct access thru low-level io interface */
 static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)

Re: [PATCH 2/2] ARM : OMAP : Add empty function in header file

[Sergei Shtylyov]

Hello.

Maulik Mankad wrote:

> ARM : OMAP : Add empty function in header file
>
> This patch adds empty functions for usb_nop_xceiv_register()
> and usb_nop_xceiv_unregister() 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: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <felipe.balbi@nokia.com>
> Cc: Greg Kroah-Hartman <gregkh@suse.de>
> Cc: Olof Johansson <olof@lixom.net>
> ---
> Index: felipe_musb/include/linux/usb/otg.h
> ===================================================================
> --- felipe_musb.orig/include/linux/usb/otg.h
> +++ felipe_musb/include/linux/usb/otg.h
> @@ -110,9 +110,14 @@ struct otg_transceiver {
>  /* for board-specific init logic */
>  extern int otg_set_transceiver(struct otg_transceiver *);
>  
> +#if defined(CONFIG_USB) || defined(CONFIG_USB_GADGET)
>  /* sometimes transceivers are accessed only through e.g. ULPI */
>  extern void usb_nop_xceiv_register(void);
>  extern void usb_nop_xceiv_unregister(void);
> +#else
> +#define usb_nop_xceiv_register()	do {} while (0)
> +#define usb_nop_xceiv_unregister()	do {} while (0)
>   

   Inline functions are preferrable to macros.

WBR, Sergei

Re: [PATCH 2/2] ARM : OMAP : Add empty function in header file

[Felipe Balbi]

Hi,

On Thu, 2009-12-31 at 18:43 +0530, Maulik Mankad wrote: 
> +#if defined(CONFIG_USB) || defined(CONFIG_USB_GADGET)

how about using CONFIG_USB_NOP_XCEIV

-- 
balbi