Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6064aca authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: move logging macros to ehci.h 



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: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6273f181

drivers/usb/host/ehci-dbg.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -18,21 +18,6 @@ 




/* this file is part of ehci-hcd.c */

/* 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

#ifdef	DEBUG





/* check the values in the HCSPARAMS register

/* check the values in the HCSPARAMS register

drivers/usb/host/ehci.h

+15 −0
Original line number Original line Diff line number Diff line
@@ -761,6 +761,21 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x) 




/*-------------------------------------------------------------------------*/

/*-------------------------------------------------------------------------*/





#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

#ifdef CONFIG_PCI





/* For working around the MosChip frame-index-register bug */

/* For working around the MosChip frame-index-register bug */