Use a more current logging style with dev_printk where possible. o Convert uses of US_DEBUGP to usb_stor_dbg o Add "struct us_data *" to usb_stor_dbg uses o usb_stor_dbg now uses struct device */dev_vprint_emit o Removed embedded function names o Coalesce formats o Remove trailing whitespace o Remove useless OOM messages o Remove useless function entry/exit logging o Convert some US_DEBUGP uses to dev_info and dev_dbg Object size is slightly reduced when debugging is enabled, slightly increased with no debugging because some initialization and removal messages are now always emitted. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		
			
				
	
	
		
			69 lines
		
	
	
	
		
			2.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			69 lines
		
	
	
	
		
			2.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/* Driver for USB Mass Storage compliant devices
 | 
						|
 * Debugging Functions Header File
 | 
						|
 *
 | 
						|
 * Current development and maintenance by:
 | 
						|
 *   (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
 | 
						|
 *
 | 
						|
 * Initial work by:
 | 
						|
 *   (c) 1999 Michael Gee (michael@linuxspecific.com)
 | 
						|
 *
 | 
						|
 * This driver is based on the 'USB Mass Storage Class' document. This
 | 
						|
 * describes in detail the protocol used to communicate with such
 | 
						|
 * devices.  Clearly, the designers had SCSI and ATAPI commands in
 | 
						|
 * mind when they created this document.  The commands are all very
 | 
						|
 * similar to commands in the SCSI-II and ATAPI specifications.
 | 
						|
 *
 | 
						|
 * It is important to note that in a number of cases this class
 | 
						|
 * exhibits class-specific exemptions from the USB specification.
 | 
						|
 * Notably the usage of NAK, STALL and ACK differs from the norm, in
 | 
						|
 * that they are used to communicate wait, failed and OK on commands.
 | 
						|
 *
 | 
						|
 * Also, for certain devices, the interrupt endpoint is used to convey
 | 
						|
 * status of a command.
 | 
						|
 *
 | 
						|
 * Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
 | 
						|
 * information about this driver.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify it
 | 
						|
 * under the terms of the GNU General Public License as published by the
 | 
						|
 * Free Software Foundation; either version 2, or (at your option) any
 | 
						|
 * later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful, but
 | 
						|
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License along
 | 
						|
 * with this program; if not, write to the Free Software Foundation, Inc.,
 | 
						|
 * 675 Mass Ave, Cambridge, MA 02139, USA.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef _DEBUG_H_
 | 
						|
#define _DEBUG_H_
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
 | 
						|
#define USB_STORAGE "usb-storage: "
 | 
						|
 | 
						|
#ifdef CONFIG_USB_STORAGE_DEBUG
 | 
						|
void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb);
 | 
						|
void usb_stor_show_sense(const struct us_data *us, unsigned char key,
 | 
						|
			 unsigned char asc, unsigned char ascq);
 | 
						|
__printf(2, 3) int usb_stor_dbg(const struct us_data *us,
 | 
						|
				const char *fmt, ...);
 | 
						|
 | 
						|
#define US_DEBUGPX(fmt, ...)	printk(fmt, ##__VA_ARGS__)
 | 
						|
#define US_DEBUG(x)		x
 | 
						|
#else
 | 
						|
__printf(2, 3)
 | 
						|
static inline int _usb_stor_dbg(const struct us_data *us,
 | 
						|
				const char *fmt, ...) {return 1;}
 | 
						|
#define usb_stor_dbg(us, fmt, ...)				\
 | 
						|
	do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0)
 | 
						|
#define US_DEBUGPX(fmt, ...)					\
 | 
						|
	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
 | 
						|
#define US_DEBUG(x)
 | 
						|
#endif
 | 
						|
 | 
						|
#endif
 |