On Wed, Oct 10, 2012 at 03:07:30PM -0400, Alan Stern wrote:
> In preparation for splitting the ehci-hcd driver into a core library
> and separate platform-specific driver modules, this patch (as1616)
> moves the console logging macros from ehci-dbg.c to ehci.h, where they
> will be available to the platform drivers.
>
> Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Looks good:
Acked-by: Felipe Balbi <balbi@xxxxxx>
>
> ---
>
> drivers/usb/host/ehci-dbg.c | 15 ---------------
> drivers/usb/host/ehci.h | 15 +++++++++++++++
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
> Index: usb-3.6/drivers/usb/host/ehci-dbg.c
> ===================================================================
> --- usb-3.6.orig/drivers/usb/host/ehci-dbg.c
> +++ usb-3.6/drivers/usb/host/ehci-dbg.c
> @@ -18,21 +18,6 @@
>
> /* this file is part of ehci-hcd.c */
>
> -#define ehci_dbg(ehci, fmt, args...) \
> - dev_dbg (ehci_to_hcd(ehci)->self.controller , fmt , ## args )
> -#define ehci_err(ehci, fmt, args...) \
> - dev_err (ehci_to_hcd(ehci)->self.controller , fmt , ## args )
> -#define ehci_info(ehci, fmt, args...) \
> - dev_info (ehci_to_hcd(ehci)->self.controller , fmt , ## args )
> -#define ehci_warn(ehci, fmt, args...) \
> - dev_warn (ehci_to_hcd(ehci)->self.controller , fmt , ## args )
> -
> -#ifdef VERBOSE_DEBUG
> -# define ehci_vdbg ehci_dbg
> -#else
> - static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {}
> -#endif
> -
> #ifdef DEBUG
>
> /* check the values in the HCSPARAMS register
> Index: usb-3.6/drivers/usb/host/ehci.h
> ===================================================================
> --- usb-3.6.orig/drivers/usb/host/ehci.h
> +++ usb-3.6/drivers/usb/host/ehci.h
> @@ -762,6 +762,21 @@ static inline u32 hc32_to_cpup (const st
>
> /*-------------------------------------------------------------------------*/
>
> +#define ehci_dbg(ehci, fmt, args...) \
> + dev_dbg(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
> +#define ehci_err(ehci, fmt, args...) \
> + dev_err(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
> +#define ehci_info(ehci, fmt, args...) \
> + dev_info(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
> +#define ehci_warn(ehci, fmt, args...) \
> + dev_warn(ehci_to_hcd(ehci)->self.controller , fmt , ## args)
> +
> +#ifdef VERBOSE_DEBUG
> +# define ehci_vdbg ehci_dbg
> +#else
> + static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {}
> +#endif
> +
> #ifdef CONFIG_PCI
>
> /* For working around the MosChip frame-index-register bug */
>
--
balbi
Attachment:
signature.asc
Description: Digital signature
