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

Commit 75b9130e authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

usb: storage: Add usb_stor_dbg, reduce object size 



Reduce the size of the objects by consolidating
the duplicated USB_STORAGE into a single function.

Add function usb_stor_dbg to emit debugging messages.
Always validate the format and arguments.
Reduce the number of uses of CONFIG_USB_STORAGE_DEBUG.

Reduces size of objects ~7KB when CONFIG_USB_STORAGE_DEBUG
is set.

$ size drivers/usb/storage/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 140133	  55296	  70312	 265741	  40e0d	drivers/usb/storage/built-in.o.new
 147494	  55248	  70296	 273038	  42a8e	drivers/usb/storage/built-in.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61ac6ac8

drivers/usb/storage/debug.c

+19 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ void usb_stor_show_command(struct scsi_cmnd *srb) 
	default: what = "(unknown command)"; break;

	}

	US_DEBUGP("Command %s (%d bytes)\n", what, srb->cmd_len);

	US_DEBUGP("");

	US_DEBUGP("bytes: ");

	for (i = 0; i < srb->cmd_len && i < 16; i++)

		US_DEBUGPX(" %02x", srb->cmnd[i]);

	US_DEBUGPX("\n");
@@ -175,3 +175,21 @@ void usb_stor_show_sense( 
	US_DEBUGPX(what, ascq);

	US_DEBUGPX("\n");

}



int usb_stor_dbg(const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int r;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	r = printk(KERN_DEBUG USB_STORAGE "%pV", &vaf);



	va_end(args);



	return r;

}

drivers/usb/storage/debug.h

+9 −5
Original line number Diff line number Diff line
@@ -50,12 +50,16 @@ 
void usb_stor_show_command(struct scsi_cmnd *srb);

void usb_stor_show_sense( unsigned char key,

		unsigned char asc, unsigned char ascq );

#define US_DEBUGP(x...) printk( KERN_DEBUG USB_STORAGE x )

#define US_DEBUGPX(x...) printk( x )

__printf(1, 2) int usb_stor_dbg(const char *fmt, ...);



#define US_DEBUGP(fmt, ...)	usb_stor_dbg(fmt, ##__VA_ARGS__)

#define US_DEBUGPX(fmt, ...)	printk(fmt, ##__VA_ARGS__)

#define US_DEBUG(x)		x

#else

#define US_DEBUGP(x...)

#define US_DEBUGPX(x...)

#define US_DEBUGP(fmt, ...)					\

	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)

#define US_DEBUGPX(fmt, ...)					\

	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)

#define US_DEBUG(x)

#endif

drivers/usb/storage/isd200.c

+6 −6
Original line number Diff line number Diff line
@@ -926,10 +926,6 @@ static int isd200_try_enum(struct us_data *us, unsigned char master_slave, 


	/* loop until we detect !BSY or timeout */

	while(1) {

#ifdef CONFIG_USB_STORAGE_DEBUG

		char* mstr = master_slave == ATA_ADDRESS_DEVHEAD_STD ?

			"Master" : "Slave";

#endif



		status = isd200_action( us, ACTION_ENUM, NULL, master_slave );

		if ( status != ISD200_GOOD )
@@ -942,9 +938,13 @@ static int isd200_try_enum(struct us_data *us, unsigned char master_slave, 


		if (!detect) {

			if (regs[ATA_REG_STATUS_OFFSET] & ATA_BUSY) {

				US_DEBUGP("   %s status is still BSY, try again...\n",mstr);

				US_DEBUGP("   %s status is still BSY, try again...\n",

					  master_slave == ATA_ADDRESS_DEVHEAD_STD ?

					  "Master" : "Slave");

			} else {

				US_DEBUGP("   %s status !BSY, continue with next operation\n",mstr);

				US_DEBUGP("   %s status !BSY, continue with next operation\n",

					  master_slave == ATA_ADDRESS_DEVHEAD_STD ?

					  "Master" : "Slave");

				break;

			}

		}