> -----Original Message-----
> From: Mankad, Maulik Ojas
> Sent: Monday, January 04, 2010 4:40 PM
> To: linux-omap@xxxxxxxxxxxxxxx
> Cc: linux-usb@xxxxxxxxxxxxxxx; Mankad, Maulik Ojas; Tony Lindgren; Felipe
> Balbi; Greg Kroah-Hartman; Olof Johansson; Sergei Shtylyov; Gupta, Ajay
> Kumar
> Subject: [PATCH v2 1/2] ARM : OMAP : Add empty functions in header file
>
> ARM : OMAP : Add empty functions in header file
>
> Add 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@xxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>
> Cc: Felipe Balbi <felipe.balbi@xxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: Olof Johansson <olof@xxxxxxxxx>
> Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
> Cc: Gupta, Ajay Kumar <ajay.gupta@xxxxxx>
> ---
> 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,19 @@ struct otg_transceiver {
> /* for board-specific init logic */
> extern int otg_set_transceiver(struct otg_transceiver *);
>
> +#if defined(CONFIG_USB_NOP_XCEIV)
> /* sometimes transceivers are accessed only through e.g. ULPI */
> extern void usb_nop_xceiv_register(void);
> extern void usb_nop_xceiv_unregister(void);
> +#else
> +extern inline void usb_nop_xceiv_register()
> +{
> +}
> +
> +extern inline void usb_nop_xceiv_unregister()
^^^^^^
'extern' should not be used here.
-Ajay
> +#endif
>
> /* helpers for direct access thru low-level io interface */
> static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
