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

Commit 00274921 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: gadget code switches to pr_err() and friends 



We now have pr_err(), pr_warning(), and friends ... start using
them in the gadget stack instead of printk(KERN_ERR) and friends.
This gives us shorter lines and somewhat increased readability.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 269954e5

drivers/usb/gadget/at91_udc.h

+4 −9
Original line number Diff line number Diff line
@@ -158,12 +158,6 @@ struct at91_request { 


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



#ifdef DEBUG

#define DBG(stuff...)		printk(KERN_DEBUG "udc: " stuff)

#else

#define DBG(stuff...)		do{}while(0)

#endif



#ifdef VERBOSE

#    define VDBG		DBG

#else
@@ -176,9 +170,10 @@ struct at91_request { 
#    define PACKET(stuff...)	do{}while(0)

#endif



#define ERR(stuff...)		printk(KERN_ERR "udc: " stuff)

#define WARN(stuff...)		printk(KERN_WARNING "udc: " stuff)

#define INFO(stuff...)		printk(KERN_INFO "udc: " stuff)

#define ERR(stuff...)		pr_err("udc: " stuff)

#define WARN(stuff...)		pr_warning("udc: " stuff)

#define INFO(stuff...)		pr_info("udc: " stuff)

#define DBG(stuff...)		pr_debug("udc: " stuff)



#endif

drivers/usb/gadget/atmel_usba_udc.c

+4 −7
Original line number Diff line number Diff line
@@ -1384,8 +1384,7 @@ delegate: 
	return retval;



stall:

	printk(KERN_ERR

		"udc: %s: Invalid setup request: %02x.%02x v%04x i%04x l%d, "

	pr_err("udc: %s: Invalid setup request: %02x.%02x v%04x i%04x l%d, "

		"halting endpoint...\n",

		ep->ep.name, crq->bRequestType, crq->bRequest,

		le16_to_cpu(crq->wValue), le16_to_cpu(crq->wIndex),
@@ -1456,8 +1455,7 @@ restart: 
				set_protocol_stall(udc, ep);

			break;

		default:

			printk(KERN_ERR

				"udc: %s: TXCOMP: Invalid endpoint state %d, "

			pr_err("udc: %s: TXCOMP: Invalid endpoint state %d, "

				"halting endpoint...\n",

				ep->ep.name, ep->state);

			set_protocol_stall(udc, ep);
@@ -1486,8 +1484,7 @@ restart: 
		default:

			usba_ep_writel(ep, CLR_STA, USBA_RX_BK_RDY);

			usba_ep_writel(ep, CTL_DIS, USBA_RX_BK_RDY);

			printk(KERN_ERR

				"udc: %s: RXRDY: Invalid endpoint state %d, "

			pr_err("udc: %s: RXRDY: Invalid endpoint state %d, "

				"halting endpoint...\n",

				ep->ep.name, ep->state);

			set_protocol_stall(udc, ep);
@@ -1532,7 +1529,7 @@ restart: 
		pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA));

		DBG(DBG_HW, "Packet length: %u\n", pkt_len);

		if (pkt_len != sizeof(crq)) {

			printk(KERN_WARNING "udc: Invalid packet length %u "

			pr_warning("udc: Invalid packet length %u "

				"(expected %lu)\n", pkt_len, sizeof(crq));

			set_protocol_stall(udc, ep);

			return;

drivers/usb/gadget/atmel_usba_udc.h

+2 −5
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ 
#define FIFO_IOMEM_ID	0

#define CTRL_IOMEM_ID	1



#ifdef DEBUG

#define DBG_ERR		0x0001	/* report all error returns */

#define DBG_HW		0x0002	/* debug hardware initialization */

#define DBG_GADGET	0x0004	/* calls to/from gadget driver */
@@ -230,14 +229,12 @@ 
#define DBG_NONE	0x0000



#define DEBUG_LEVEL	(DBG_ERR)



#define DBG(level, fmt, ...)					\

	do {							\

		if ((level) & DEBUG_LEVEL)			\

			printk(KERN_DEBUG "udc: " fmt, ## __VA_ARGS__);	\

			pr_debug("udc: " fmt, ## __VA_ARGS__);	\

	} while (0)

#else

#define DBG(level, fmt...)

#endif



enum usba_ctrl_state {

	WAIT_FOR_SETUP,

drivers/usb/gadget/file_storage.c

+5 −9
Original line number Diff line number Diff line
@@ -275,19 +275,15 @@ MODULE_LICENSE("Dual BSD/GPL"); 


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



#ifdef DEBUG

#define LDBG(lun,fmt,args...) \

	dev_dbg(&(lun)->dev , fmt , ## args)

#define MDBG(fmt,args...) \

	printk(KERN_DEBUG DRIVER_NAME ": " fmt , ## args)

#else

#define LDBG(lun,fmt,args...) \

	do { } while (0)

#define MDBG(fmt,args...) \

	do { } while (0)

	pr_debug(DRIVER_NAME ": " fmt , ## args)



#ifndef DEBUG

#undef VERBOSE_DEBUG

#undef DUMP_MSGS

#endif /* DEBUG */

#endif /* !DEBUG */



#ifdef VERBOSE_DEBUG

#define VLDBG	LDBG
@@ -304,7 +300,7 @@ MODULE_LICENSE("Dual BSD/GPL"); 
	dev_info(&(lun)->dev , fmt , ## args)



#define MINFO(fmt,args...) \

	printk(KERN_INFO DRIVER_NAME ": " fmt , ## args)

	pr_info(DRIVER_NAME ": " fmt , ## args)



#define DBG(d, fmt, args...) \

	dev_dbg(&(d)->gadget->dev , fmt , ## args)

drivers/usb/gadget/fsl_usb2_udc.h

+3 −3
Original line number Diff line number Diff line
@@ -551,9 +551,9 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) 
#define VDBG(stuff...)	do{}while(0)

#endif



#define ERR(stuff...)		printk(KERN_ERR "udc: " stuff)

#define WARN(stuff...)		printk(KERN_WARNING "udc: " stuff)

#define INFO(stuff...)		printk(KERN_INFO "udc: " stuff)

#define ERR(stuff...)		pr_err("udc: " stuff)

#define WARN(stuff...)		pr_warning("udc: " stuff)

#define INFO(stuff...)		pr_info("udc: " stuff)



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