usb: storage: Add usb_stor_dbg, reduce object size
Subsystems (2)
PATCH 1/1 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
--- drivers/usb/storage/debug.c | 20 +++++++++++++++++++- drivers/usb/storage/debug.h | 14 +++++++++----- drivers/usb/storage/isd200.c | 12 ++++++------ 3 files changed, 34 insertions(+), 12 deletions(-)
drivers/usb/storage/debug.c +19 -1
@@ -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
@@ -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 ) -#define US_DEBUG (x) 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
@@ -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 ; } }
Alan Stern
maintainerQuoted 10 lines · Joe Perches
Reduce the size of the objects by consolidating the duplicated
USB_STORAGEinto a single function.Add function
usb_stor_dbgto emit debugging messages. Always validate the format and arguments. Reduce the number of uses ofCONFIG_USB_STORAGE_DEBUG.Reduces size of objects ~7KB when
CONFIG_USB_STORAGE_DEBUGis set.
Quoted 6 lines
$ 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.oldSigned-off-by Joe Perches <[email protected]>
Is there any reasonable way to change this so that US_DEBUGP gets converted to a dev_dbg call instead of a printk call? Not including the device identifier in the output can be a real problem if there are multiple mass-storage devices in the system.
Alan Stern
Quoted 3 lines · Alan Stern
Quoted 2 lines · Joe Perches
Reduce the size of the objects by consolidating the duplicated
USB_STORAGEinto a single function.
[]
Quoted 4 lines
Is there any reasonable way to change this so that
US_DEBUGPgets converted to adev_dbgcall instead of a printk call? Not including the device identifier in the output can be a real problem if there are multiple mass-storage devices in the system.
No.
There's no standardized name of a struct device *. struct us_data *us exists for most of them but not all. Some have a struct isd_200 *info available, other don't have a struct device * at all.
Some or all US_DEBUGP calls would have to change form.
Perhaps a good patch would be to convert US_DEBUGP calls where a struct us_data * is available to to us_stor_dbg(struct us_data *, const char *fmt, ...)
Alan Stern
maintainerQuoted 17 lines · Joe Perches
Quoted 3 lines · Alan Stern
Quoted 2 lines · Joe Perches
Reduce the size of the objects by consolidating the duplicated
USB_STORAGEinto a single function.[]
Quoted 4 lines
Is there any reasonable way to change this so that
US_DEBUGPgets converted to adev_dbgcall instead of a printk call? Not including the device identifier in the output can be a real problem if there are multiple mass-storage devices in the system.No.
There's no standardized name of a struct device *. struct
us_data*us exists for most of them but not all. Some have a structisd_200*info available, other don't have a struct device * at all.
Quoted 6 lines
Some or all
US_DEBUGPcalls would have to change form.Perhaps a good patch would be to convert
US_DEBUGPcalls where a structus_data* is available to tous_stor_dbg(struct us_data *, const char *fmt, ...)
That would be an excellent start.
Alan Stern
Quoted 19 lines · Alan Stern
Quoted 17 lines · Joe Perches
Quoted 3 lines · Alan Stern
Quoted 2 lines · Joe Perches
Reduce the size of the objects by consolidating the duplicated
USB_STORAGEinto a single function.[]
Quoted 4 lines
Is there any reasonable way to change this so that
US_DEBUGPgets converted to adev_dbgcall instead of a printk call? Not including the device identifier in the output can be a real problem if there are multiple mass-storage devices in the system.No.
There's no standardized name of a struct device *. struct
us_data*us exists for most of them but not all. Some have a structisd_200*info available, other don't have a struct device * at all.
Quoted 8 lines
Quoted 6 lines
Some or all
US_DEBUGPcalls would have to change form.Perhaps a good patch would be to convert
US_DEBUGPcalls where a structus_data* is available to tous_stor_dbg(struct us_data *, const char *fmt, ...)That would be an excellent start.
Hey Alan, care to try this?
o Convert uses of US_DEBUGP to usb_stor_dbg
o Add "struct us_data *" to usb_stor_dbg uses when available and NULL when not.
o usb_stor_dbg now uses struct device */dev_vprint_emit when available
o Removed embedded function names
o Coalesce formats
o Remove trailing whitespace
o Remove useless OOM messages
o Remove useless function entry/exit logging
Compiles but completely untested.
This won't apply against Greg's latest usb tree
as he's just taken the previous patch.
---
drivers/usb/storage/alauda.c | 103 ++++++------- drivers/usb/storage/cypress_atacb.c | 2 +- drivers/usb/storage/datafab.c | 59 ++++---- drivers/usb/storage/debug.c | 30 +++- drivers/usb/storage/debug.h | 15 +- drivers/usb/storage/ene_ub6250.c | 85 +++++------ drivers/usb/storage/freecom.c | 73 ++++----- drivers/usb/storage/initializers.c | 10 +- drivers/usb/storage/isd200.c | 292 ++++++++++++++++++------------------ drivers/usb/storage/jumpshot.c | 61 ++++---- drivers/usb/storage/karma.c | 6 +- drivers/usb/storage/option_ms.c | 23 +-- drivers/usb/storage/realtek_cr.c | 128 ++++++---------- drivers/usb/storage/scsiglue.c | 9 +- drivers/usb/storage/sddr09.c | 145 +++++++++--------- drivers/usb/storage/sddr55.c | 86 +++++------ drivers/usb/storage/shuttle_usbat.c | 109 +++++++------- drivers/usb/storage/sierra_ms.c | 37 ++--- drivers/usb/storage/transport.c | 179 +++++++++++----------- drivers/usb/storage/usb.c | 86 ++++------- 20 files changed, 742 insertions(+), 796 deletions(-)
drivers/usb/storage/alauda.c +47 -56
@@ -326,8 +326,8 @@ static int alauda_get_media_status(struct us_data *us, unsigned char *data) rc =usb_stor_ctrl_transfer (us, us->recv_ctrl_pipe, command,0xc0 ,0 ,1 , data,2 ); -US_DEBUGP ("alauda_get_media_status: Media status %02X %02X\n" , - data[0 ], data[1 ]); +usb_stor_dbg (us,"Media status %02X %02X\n" , + data[0 ], data[1 ]);return rc; }
@@ -402,7 +402,7 @@ static int alauda_init_media(struct us_data *us) ready =1 ; } -US_DEBUGP ("alauda_init_media: We are ready for action!\n" ); +usb_stor_dbg (us,"We are ready for action!\n" );if (alauda_ack_media (us) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -413,15 +413,15 @@ static int alauda_init_media(struct us_data *us)return USB_STOR_TRANSPORT_ERROR ;if (data[0 ] !=0x14 ) { -US_DEBUGP ("alauda_init_media: Media not ready after ack\n" ); +usb_stor_dbg (us,"Media not ready after ack\n" );return USB_STOR_TRANSPORT_ERROR ; }if (alauda_get_media_signature (us, data) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; -US_DEBUGP ("alauda_init_media: Media signature: %02X %02X %02X %02X\n" , - data[0 ], data[1 ], data[2 ], data[3 ]); +usb_stor_dbg (us,"Media signature: %02X %02X %02X %02X\n" , + data[0 ], data[1 ], data[2 ], data[3 ]); media_info =alauda_card_find_id (data[1 ]);if (media_info ==NULL ) { printk(KERN_WARNING
@@ -432,8 +432,8 @@ static int alauda_init_media(struct us_data *us) }MEDIA_INFO (us).capacity =1 << media_info->chipshift; -US_DEBUGP ("Found media with capacity: %ldMB\n" , -MEDIA_INFO (us).capacity >>20 ); +usb_stor_dbg (us,"Found media with capacity: %ldMB\n" , +MEDIA_INFO (us).capacity >>20 );MEDIA_INFO (us).pageshift = media_info->pageshift;MEDIA_INFO (us).blockshift = media_info->blockshift;
@@ -472,7 +472,7 @@ static int alauda_check_media(struct us_data *us)/* Check for no media or door open */ if ((status[0 ] &0x80 ) || ((status[0 ] &0x1F ) ==0x10 ) || ((status[1 ] &0x01 ) ==0 )) { -US_DEBUGP ("alauda_check_media: No media, or door open\n" ); +usb_stor_dbg (us,"No media, or door open\n" );alauda_free_maps (&MEDIA_INFO (us)); info->sense_key =0x02 ; info->sense_asc =0x3A ;
@@ -482,7 +482,7 @@ static int alauda_check_media(struct us_data *us)/* Check for media change */ if (status[0 ] &0x08 ) { -US_DEBUGP ("alauda_check_media: Media change detected\n" ); +usb_stor_dbg (us,"Media change detected\n" );alauda_free_maps (&MEDIA_INFO (us));alauda_init_media (us);
@@ -518,7 +518,7 @@ static int alauda_check_status2(struct us_data *us)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_check_status2: %02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]); +usb_stor_dbg (us,"%02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]);if (data[0 ] &ALAUDA_STATUS_ERROR )return USB_STOR_XFER_ERROR ;
@@ -584,7 +584,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) goto error; } -US_DEBUGP ("alauda_read_map: Mapping blocks for zone %d\n" , zone); +usb_stor_dbg (us,"Mapping blocks for zone %d\n" , zone);/* 1024 PBA's per zone */ for (i =0 ; i < zonesize; i++)
@@ -604,7 +604,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone)if (data[j] !=0 ) goto nonz; pba_to_lba[i] =UNUSABLE ; -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping\n" , blocknum); +usb_stor_dbg (us,"PBA %d has no logical mapping\n" , blocknum);continue ; nonz:
@@ -617,19 +617,18 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) nonff:/* normal PBAs start with six FFs */ if (j <6 ) { -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping: " -"reserved area = %02X%02X%02X%02X " -"data status %02X block status %02X\n" , - blocknum, data[0 ], data[1 ], data[2 ], data[3 ], - data[4 ], data[5 ]); +usb_stor_dbg (us,"PBA %d has no logical mapping: reserved area = %02X%02X%02X%02X data status %02X block status %02X\n" , + blocknum, + data[0 ], data[1 ], data[2 ], data[3 ], + data[4 ], data[5 ]); pba_to_lba[i] =UNUSABLE ;continue ; }if ((data[6 ] >>4 ) !=0x01 ) { -US_DEBUGP ("alauda_read_map: PBA %d has invalid address " -"field %02X%02X/%02X%02X\n" , - blocknum, data[6 ], data[7 ], data[11 ], data[12 ]); +usb_stor_dbg (us,"PBA %d has invalid address field %02X%02X/%02X%02X\n" , + blocknum, data[6 ], data[7 ], + data[11 ], data[12 ]); pba_to_lba[i] =UNUSABLE ;continue ; }
@@ -711,7 +710,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba) };unsigned char buf[2 ]; -US_DEBUGP ("alauda_erase_block: Erasing PBA %d\n" , pba); +usb_stor_dbg (us,"Erasing PBA %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -723,8 +722,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_erase_block: Erase result: %02X %02X\n" , - buf[0 ], buf[1 ]); +usb_stor_dbg (us,"Erase result: %02X %02X\n" , buf[0 ], buf[1 ]);return rc; }
@@ -741,8 +739,7 @@ static int alauda_read_block_raw(struct us_data *us, u16 pba, PBA_ZONE(pba), 0, PBA_LO(pba) + page, pages, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_read_block: pba %d page %d count %d\n" , - pba, page, pages); +usb_stor_dbg (us,"pba %d page %d count %d\n" , pba, page, pages); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -793,7 +790,7 @@ static int alauda_write_block(struct us_data *us, u16 pba, unsigned char *data) PBA_ZONE(pba), 0, PBA_LO(pba), 32, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_write_block: pba %d\n" , pba); +usb_stor_dbg (us,"pba %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -866,14 +863,14 @@ static int alauda_write_lba(struct us_data *us, u16 lba, cptr = bptr + pagesize;nand_compute_ecc (bptr, ecc);if (!nand_compare_ecc (cptr+13 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d- of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d- of pba %d\n" , + i, pba);nand_store_ecc (cptr+13 , ecc); }nand_compute_ecc (bptr + (pagesize /2 ), ecc);if (!nand_compare_ecc (cptr+8 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d+ of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d+ of pba %d\n" , + i, pba);nand_store_ecc (cptr+8 , ecc); } cptr[6 ] = cptr[11 ] =MSB_of (lbap);
@@ -900,8 +897,7 @@ static int alauda_write_lba(struct us_data *us, u16 lba, new_pba_offset = new_pba - (zone * zonesize);MEDIA_INFO (us).pba_to_lba[zone][new_pba_offset] = lba;MEDIA_INFO (us).lba_to_pba[zone][lba_offset] = new_pba; -US_DEBUGP ("alauda_write_lba: Remapped LBA %d to PBA %d\n" , - lba, new_pba); +usb_stor_dbg (us,"Remapped LBA %d to PBA %d\n" , lba, new_pba);if (pba !=UNDEF ) {unsigned int pba_offset = pba - (zone * zonesize);
@@ -964,8 +960,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("Error: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Error: Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -978,8 +974,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address, pba =MEDIA_INFO (us).lba_to_pba[zone][lba_offset];if (pba ==UNDEF ) {/* this lba was never written */ -US_DEBUGP ("Read %d zero pages (LBA %d) page %d\n" , - pages, lba, page); +usb_stor_dbg (us,"Read %d zero pages (LBA %d) page %d\n" , + pages, lba, page);/* This is not really an error. It just means that the block has never been written.
@@ -988,9 +984,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,memset (buffer,0 , len); }else { -US_DEBUGP ("Read %d pages, from PBA %d" -" (LBA %d) page %d\n" , - pages, pba, lba, page); +usb_stor_dbg (us,"Read %d pages, from PBA %d (LBA %d) page %d\n" , + pages, pba, lba, page); result =alauda_read_block (us, pba, page, pages, buffer);if (result !=USB_STOR_TRANSPORT_GOOD )
@@ -1066,8 +1061,8 @@ static int alauda_write_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("alauda_write_data: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -1122,11 +1117,9 @@ static int init_alauda(struct us_data *us)nand_init_ecc (); us->extra =kzalloc (sizeof (struct alauda_info ),GFP_NOIO ); -if (!us->extra) { -US_DEBUGP ("init_alauda: Gah! Can't allocate storage for" -"alauda info struct!\n" ); +if (!us->extra)return USB_STOR_TRANSPORT_ERROR ; - } + info = (struct alauda_info *) us->extra; us->extra_destructor = alauda_info_destructor;
@@ -1147,15 +1140,14 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) };if (srb->cmnd[0 ] ==INQUIRY ) { -US_DEBUGP ("alauda_transport: INQUIRY. " -"Returning bogus response.\n" ); +usb_stor_dbg (us,"INQUIRY. Returning bogus response.\n" );memcpy (ptr, inquiry_response,sizeof (inquiry_response));fill_inquiry_response (us, ptr,36 );return USB_STOR_TRANSPORT_GOOD ; }if (srb->cmnd[0 ] ==TEST_UNIT_READY ) { -US_DEBUGP ("alauda_transport: TEST_UNIT_READY.\n" ); +usb_stor_dbg (us,"TEST_UNIT_READY\n" );return alauda_check_media (us); }
@@ -1193,8 +1185,8 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: READ_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"READ_10: page %d pagect %d\n" , + page, pages);return alauda_read_data (us, page, pages); }
@@ -1211,14 +1203,13 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: WRITE_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"WRITE_10: page %d pagect %d\n" , page, pages);return alauda_write_data (us, page, pages); }if (srb->cmnd[0 ] ==REQUEST_SENSE ) { -US_DEBUGP ("alauda_transport: REQUEST_SENSE.\n" ); +usb_stor_dbg (us,"REQUEST_SENSE\n" );memset (ptr,0 ,18 ); ptr[0 ] =0xF0 ;
@@ -1237,8 +1228,8 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us)return USB_STOR_TRANSPORT_GOOD ; } -US_DEBUGP ("alauda_transport: Gah! Unknown command: %d (0x%x)\n" , - srb->cmnd[0 ], srb->cmnd[0 ]); +usb_stor_dbg (us,"Gah! Unknown command: %d (0x%x)\n" , + srb->cmnd[0 ], srb->cmnd[0 ]); info->sense_key =0x05 ; info->sense_asc =0x20 ; info->sense_ascq =0x00 ;
drivers/usb/storage/cypress_atacb.c +1 -1
@@ -159,7 +159,7 @@ static void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)if (srb->result ==SAM_STAT_CHECK_CONDITION &&memcmp (srb->sense_buffer, usb_stor_sense_invalidCDB,sizeof (usb_stor_sense_invalidCDB)) ==0 ) { -US_DEBUGP ("cypress atacb not supported ???\n" ); +usb_stor_dbg (us,"cypress atacb not supported ???\n" ); goto end; }
drivers/usb/storage/datafab.c +30 -29
174 lines not on this page · raw message
drivers/usb/storage/debug.c +27 -3
@@ -42,11 +42,13 @@* 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/device.h> #include <linux/cdrom.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include "usb.h" #include "debug.h" #include "scsi.h"
@@ -149,8 +151,8 @@ void usb_stor_show_command(struct scsi_cmnd *srb)case WRITE_LONG_2 : what ="WRITE_LONG_2" ;break ;default : what ="(unknown command)" ;break ; } -US_DEBUGP ("Command %s (%d bytes)\n" , what, srb->cmd_len); -US_DEBUGP ("" ); +usb_stor_dbg (NULL ,"Command %s (%d bytes)\n" , what, srb->cmd_len); +usb_stor_dbg (NULL ,"bytes: " );for (i =0 ; i < srb->cmd_len && i <16 ; i++)US_DEBUGPX (" %02x" , srb->cmnd[i]);US_DEBUGPX ("\n" );
@@ -171,7 +173,29 @@ void usb_stor_show_sense(if (what ==NULL ) what ="(unknown ASC/ASCQ)" ; -US_DEBUGP ("%s: " , keystr); +usb_stor_dbg (NULL ,"%s: " , keystr);US_DEBUGPX (what, ascq);US_DEBUGPX ("\n" ); } + +int usb_stor_dbg (const struct us_data *us,const char *fmt, ...) +{ +struct va_format vaf; +va_list args; +int r; + +va_start (args, fmt); + +if (us && us->pusb_dev) { + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args); + }else { + vaf.fmt = fmt; + vaf.va = &args; + + r = printk(KERN_DEBUG USB_STORAGE "%pV", &vaf); + } + +va_end (args); + +return r; +}
drivers/usb/storage/debug.h +10 -5
@@ -50,12 +50,17 @@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 ) -#define US_DEBUG (x) x +__printf(2, 3) int usb_stor_dbg(const struct us_data *us, +const char *fmt, ...); + +#define US_DEBUGP (fmt, ...) usb_stor_dbg(NULL, 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/ene_ub6250.c +43 -42
248 lines not on this page · raw message
drivers/usb/storage/freecom.c +37 -36
236 lines not on this page · raw message
drivers/usb/storage/initializers.c +5 -5
@@ -48,12 +48,12 @@ int usb_stor_euscsi_init(struct us_data *us) {int result; -US_DEBUGP ("Attempting to init eUSCSI bridge...\n" ); +usb_stor_dbg (us,"Attempting to init eUSCSI bridge...\n" ); us->iobuf[0 ] =0x1 ; result =usb_stor_control_msg (us, us->send_ctrl_pipe,0x0C ,USB_RECIP_INTERFACE |USB_TYPE_VENDOR ,0x01 ,0x0 , us->iobuf,0x1 ,5000 ); -US_DEBUGP ("-- result is %d\n" , result); +usb_stor_dbg (us,"-- result is %d\n" , result);return 0 ; }
@@ -68,7 +68,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)unsigned int partial;static char init_string[] ="\xec\x0a\x06\x00$PCCHIPS" ; -US_DEBUGP ("Sending UCR-61S2B initialization packet...\n" ); +usb_stor_dbg (us,"Sending UCR-61S2B initialization packet...\n" ); bcb->Signature =cpu_to_le32 (US_BULK_CB_SIGN ); bcb->Tag =0 ;
@@ -83,7 +83,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)if (res)return -EIO ; -US_DEBUGP ("Getting status packet...\n" ); +usb_stor_dbg (us,"Getting status packet...\n" ); res =usb_stor_bulk_transfer_buf (us, us->recv_bulk_pipe, bcs,US_BULK_CS_WRAP_LEN , &partial);if (res)
@@ -101,6 +101,6 @@ int usb_stor_huawei_e220_init(struct us_data *us)USB_REQ_SET_FEATURE ,USB_TYPE_STANDARD |USB_RECIP_DEVICE , 0x01, 0x0, NULL, 0x0, 1000); -US_DEBUGP ("Huawei mode set result is %d\n" , result); +usb_stor_dbg (us,"Huawei mode set result is %d\n" , result);return 0 ; }
drivers/usb/storage/isd200.c +148 -144
686 lines not on this page · raw message
drivers/usb/storage/jumpshot.c +31 -30
189 lines not on this page · raw message
drivers/usb/storage/karma.c +3 -3
@@ -106,7 +106,7 @@ static int rio_karma_send_command(char cmd, struct us_data *us)static unsigned char seq =1 ;struct karma_data *data = (struct karma_data *) us->extra; -US_DEBUGP ("karma: sending command %04x\n" , cmd); +usb_stor_dbg (us,"sending command %04x\n" , cmd);memset (us->iobuf,0 ,RIO_SEND_LEN );memcpy (us->iobuf,RIO_PREFIX ,RIO_PREFIX_LEN ); us->iobuf[5 ] = cmd;
@@ -139,10 +139,10 @@ static int rio_karma_send_command(char cmd, struct us_data *us)if (seq ==0 ) seq =1 ; -US_DEBUGP ("karma: sent command %04x\n" , cmd); +usb_stor_dbg (us,"sent command %04x\n" , cmd);return 0 ; err: -US_DEBUGP ("karma: command %04x failed\n" , cmd); +usb_stor_dbg (us,"command %04x failed\n" , cmd);return USB_STOR_TRANSPORT_FAILED ; }
drivers/usb/storage/option_ms.c +12 -11
@@ -50,7 +50,7 @@ static int option_rezero(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"DEVICE MODE SWITCH\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"DEVICE MODE SWITCH" ); buffer =kzalloc (RESPONSE_LEN ,GFP_KERNEL );if (buffer ==NULL )
@@ -95,7 +95,7 @@ static int option_inquiry(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"device inquiry for vendor name\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"device inquiry for vendor name" ); buffer =kzalloc (0x24 ,GFP_KERNEL );if (buffer ==NULL )
@@ -138,31 +138,32 @@ int option_ms_init(struct us_data *us) {int result; -US_DEBUGP ("Option MS: option_ms_init called\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"option_ms_init called" );/* Additional test for vendor information via INQUIRY, * because some vendor/product IDs are ambiguous */ result =option_inquiry (us);if (result !=0 ) { -US_DEBUGP ("Option MS: vendor is not Option or not determinable," -" no action taken\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"vendor is not Option or not determinable, no action taken" );return 0 ; }else -US_DEBUGP ("Option MS: this is a genuine Option device," -" proceeding\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"this is a genuine Option device, proceeding" );/* Force Modem mode */ if (option_zero_cd ==ZCD_FORCE_MODEM ) { -US_DEBUGP ("Option MS: %s" ,"Forcing Modem Mode\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"Forcing Modem Mode" ); result =option_rezero (us);if (result !=USB_STOR_XFER_GOOD ) -US_DEBUGP ("Option MS: Failed to switch to modem mode.\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Failed to switch to modem mode" );return -EIO ; }else if (option_zero_cd ==ZCD_ALLOW_MS ) {/* Allow Mass Storage mode (keep CD-Rom) */ -US_DEBUGP ("Option MS: %s" ,"Allowing Mass Storage Mode if device" -" requests it\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Allowing Mass Storage Mode if device requests it" ); }return 0 ;
drivers/usb/storage/realtek_cr.c +45 -83
357 lines not on this page · raw message
drivers/usb/storage/scsiglue.c +1 -8
@@ -313,8 +313,6 @@ static int queuecommand_lck(struct scsi_cmnd *srb, {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); -/* check for state-transition errors */ if (us->srb !=NULL ) { printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n",
@@ -324,7 +322,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb,/* fail the command if we are disconnecting */ if (test_bit (US_FLIDX_DISCONNECTING , &us->dflags)) { -US_DEBUGP ("Fail command during disconnect\n" ); +usb_stor_dbg (us,"Fail command during disconnect\n" ); srb->result =DID_NO_CONNECT <<16 ;done (srb);return 0 ;
@@ -349,8 +347,6 @@ static int command_abort(struct scsi_cmnd *srb) {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); -/* us->srb together with the TIMED_OUT, RESETTING, and ABORTING * bits are protected by the host lock. */ scsi_lock (us_to_host (us));
@@ -386,8 +382,6 @@ static int device_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); -/* lock the device pointers and do the reset */ mutex_lock (&(us->dev_mutex)); result = us->transport_reset (us);
@@ -402,7 +396,6 @@ static int bus_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); result =usb_stor_port_reset (us);return result <0 ?FAILED :SUCCESS ; }
drivers/usb/storage/sddr09.c +71 -74
372 lines not on this page · raw message
drivers/usb/storage/sddr55.c +40 -46
215 lines not on this page · raw message
drivers/usb/storage/shuttle_usbat.c +56 -53
7 lines not on this page · raw message
drivers/usb/storage/transport.c +87 -92
179 lines not on this page · raw message
drivers/usb/storage/usb.c +33 -53
86 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Alan Stern
maintainerQuoted 19 lines · Joe Perches
Quoted 5 lines
Quoted 3 lines
Perhaps a good patch would be to convert
US_DEBUGPcalls where a structus_data* is available to tous_stor_dbg(struct us_data *, const char *fmt, ...)That would be an excellent start.
Hey Alan, care to try this?
o Convert uses of
US_DEBUGPtousb_stor_dbg
o Add "structus_data*" tousb_stor_dbguses when available and NULL when not.
ousb_stor_dbgnow uses struct device */dev_vprint_emit when available
o Removed embedded function names
o Coalesce formats
o Remove trailing whitespace
o Remove useless OOM messages
o Remove useless function entry/exit logging
Quoted 4 lines
Compiles but completely untested.
This won't apply against Greg's latest usb tree
as he's just taken the previous patch.
Wow, that's an impressive amount of work in a short time! I have only a few comments.
I'm not very concerned about the subdrivers. In fact, for testing purposes it would probably be better to start by changing just the "core" part of usb-storage (that is, the parts that actually get built into the usb-storage.o file) and then do each subdriver separately, one patch for each.
There are a few places where things could be improved...
drivers/usb/storage/debug.c void usb_stor_show_sense( · line 190
Quoted 10 lines
drivers/usb/storage/debug.c +10
-0+int usb_stor_dbg (const struct us_data *us,const char *fmt, ...) +{ +struct va_format vaf; +va_list args; +int r; + +va_start (args, fmt); + +if (us && us->pusb_dev) { + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);
Isn't there a symbolic constant you can use instead of "7"?
Quoted 22 lines
drivers/usb/storage/scsiglue.c +0
-4@@ -349,8 +347,6 @@ static int command_abort(struct scsi_cmnd *srb) {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); -/* us->srb together with the TIMED_OUT, RESETTING, and ABORTING * bits are protected by the host lock. */ scsi_lock (us_to_host (us));@@ -386,8 +382,6 @@ static int device_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); -/* lock the device pointers and do the reset */ mutex_lock (&(us->dev_mutex)); result = us->transport_reset (us);
drivers/usb/storage/scsiglue.c static int bus_reset(struct scsi_cmnd *srb) · line 401
Quoted 7 lines
drivers/usb/storage/scsiglue.c +0
-1@@ -402,7 +396,6 @@ static int bus_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); result =usb_stor_port_reset (us);return result <0 ?FAILED :SUCCESS ; }
These three functions get called only in unusual circumstances, and for debugging we do want to know when they get called. So these statements should remain.
drivers/usb/storage/usb.c int usb_stor_probe1(struct us_data **pus, · line 908
Quoted 12 lines
drivers/usb/storage/usb.c +1
-1@@ -918,7 +902,7 @@ int usb_stor_probe1(struct us_data **pus,struct us_data *us;int result; -US_DEBUGP ("USB Mass Storage device detected\n" ); +usb_stor_dbg (NULL ,"USB Mass Storage device detected\n" );/* * Ask the SCSI layer to allocate a host structure, with extra
Even though "us" isn't available here, intf is. This line can be a regular dev_dbg(&intf->dev, ...). Or even dev_info(&intf->dev, ...); this looks like the sort of thing one sees all the time in kernel logs.
drivers/usb/storage/usb.c static int storage_probe(struct usb_interface *intf, · line 1065
Quoted 12 lines
drivers/usb/storage/usb.c +2
-3@@ -1075,9 +1058,8 @@ static int storage_probe(struct usb_interface *intf, }else { unusual_dev = &for_dynamic_ids; -US_DEBUGP ("%s %s 0x%04x 0x%04x\n" ,"Use Bulk-Only transport" , -"with the Transparent SCSI protocol for dynamic id:" , - id->idVendor, id->idProduct); +usb_stor_dbg (us,"Use Bulk-Only transport with the Transparent SCSI protocol for dynamic id: 0x%04x 0x%04x\n" , + id->idVendor, id->idProduct); } result =usb_stor_probe1 (&us, intf, id, unusual_dev);
And here "us" hasn't been set yet (it gets set in usb_stor_probe1), so it shouldn't be used. This can become another dev_dbg(&intf->dev, ...) line.
Alan Stern
Quoted 1 line · Alan Stern
On Wed, 17 Apr 2013, Joe Perches wrote:
[]
Quoted 4 lines
Quoted 4 lines
drivers/usb/storage/debug.c +4
-0+int usb_stor_dbg (const struct us_data *us,const char *fmt, ...) +{ +struct va_format vaf; +va_list args;
Quoted 8 lines
drivers/usb/storage/debug.c void usb_stor_show_sense( · line 190
Quoted 6 lines
drivers/usb/storage/debug.c +6
-0+int r; + +va_start (args, fmt); + +if (us && us->pusb_dev) { + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);Isn't there a symbolic constant you can use instead of "7"?
Nope.
lib/dynamic_debug:__dynamic_dev_dbg() does the same thing.
Quoted 4 lines
drivers/usb/storage/scsiglue.c static int command_abort(struct scsi_cmnd *srb)
Quoted 4 lines
drivers/usb/storage/scsiglue.c +0
-0@@ -349,8 +347,6 @@ static int command_abort(struct scsi_cmnd *srb)
[]
Quoted 1 line
drivers/usb/storage/scsiglue.c static int command_abort(struct scsi_cmnd *srb) · line 349
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-1-US_DEBUGP ("%s called\n" , __func__);
[]
Quoted 1 line
drivers/usb/storage/scsiglue.c static int device_reset(struct scsi_cmnd *srb)
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-0@@ -386,8 +382,6 @@ static int device_reset(struct scsi_cmnd *srb)
[]
Quoted 1 line
drivers/usb/storage/scsiglue.c static int device_reset(struct scsi_cmnd *srb) · line 386
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-1-US_DEBUGP ("%s called\n" , __func__);
[]
Quoted 1 line
drivers/usb/storage/scsiglue.c static int bus_reset(struct scsi_cmnd *srb)
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-0@@ -402,7 +396,6 @@ static int bus_reset(struct scsi_cmnd *srb)
[]
Quoted 5 lines
drivers/usb/storage/scsiglue.c static int bus_reset(struct scsi_cmnd *srb) · line 402
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-1-US_DEBUGP ("%s called\n" , __func__);These three functions get called only in unusual circumstances, and for debugging we do want to know when they get called. So these statements should remain.
I'll put 'em back and resubmit the whole schmear against what Greg has in his tree now later. I do think that the function tracer does all that though and more.
Look at Documentation/trace/ftrace.txt
Quoted 1 line
drivers/usb/storage/scsiglue.c static int bus_reset(struct scsi_cmnd *srb) · line 403
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-1--- a/drivers/usb/storage/usb.c
[]
Quoted 1 line
drivers/usb/storage/scsiglue.c int usb_stor_probe1(struct us_data **pus,
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-0@@ -918,7 +902,7 @@ int usb_stor_probe1(struct us_data **pus,
[]
Quoted 2 lines
drivers/usb/storage/scsiglue.c int usb_stor_probe1(struct us_data **pus, · line 902
Quoted 2 lines
drivers/usb/storage/scsiglue.c +1
-1-US_DEBUGP ("USB Mass Storage device detected\n" ); +usb_stor_dbg (NULL ,"USB Mass Storage device detected\n" );
[]
Quoted 3 lines
Even though "us" isn't available here, intf is. This line can be a regular
dev_dbg(&intf->dev, ...). Or evendev_info(&intf->dev, ...); this looks like the sort of thing one sees all the time in kernel logs.
I'll make it dev_info
Quoted 1 line
drivers/usb/storage/scsiglue.c static int storage_probe(struct usb_interface *intf,
Quoted 1 line
drivers/usb/storage/scsiglue.c +0
-0@@ -1075,9 +1058,8 @@ static int storage_probe(struct usb_interface *intf,
[]
Quoted 6 lines
drivers/usb/storage/scsiglue.c static int storage_probe(struct usb_interface *intf, · line 1059
Quoted 2 lines
drivers/usb/storage/scsiglue.c +2
-0+usb_stor_dbg (us,"Use Bulk-Only transport with the Transparent SCSI protocol for dynamic id: 0x%04x 0x%04x\n" , + id->idVendor, id->idProduct);And here "us" hasn't been set yet (it gets set in
usb_stor_probe1), so it shouldn't be used. This can become anotherdev_dbg(&intf->dev, ...)line.
OK.
Alan Stern
maintainerQuoted 16 lines · Joe Perches
Quoted 1 line · Alan Stern
On Wed, 17 Apr 2013, Joe Perches wrote:
[]
Quoted 4 lines
Quoted 4 lines
drivers/usb/storage/debug.c +4
-0+int usb_stor_dbg (const struct us_data *us,const char *fmt, ...) +{ +struct va_format vaf; +va_list args;Quoted 8 lines
drivers/usb/storage/debug.c void usb_stor_show_sense( · line 190
Quoted 6 lines
drivers/usb/storage/debug.c +6
-0+int r; + +va_start (args, fmt); + +if (us && us->pusb_dev) { + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);Isn't there a symbolic constant you can use instead of "7"?
Quoted 2 lines
Nope.
lib/dynamic_debug:__dynamic_dev_dbg() does the same thing.
This clearly is an omission in the logging API.
Kay, why doesn't the kernel have symbolic constants for the various logging facilities and levels?
Alan Stern
Quoted 18 lines · Alan Stern
Quoted 16 lines · Joe Perches
Quoted 1 line · Alan Stern
On Wed, 17 Apr 2013, Joe Perches wrote:
[]
Quoted 12 lines
drivers/usb/storage/debug.c void usb_stor_show_sense( · line 190
Quoted 10 lines
drivers/usb/storage/debug.c +10
-0+int usb_stor_dbg (const struct us_data *us,const char *fmt, ...) +{ +struct va_format vaf; +va_list args; +int r; + +va_start (args, fmt); + +if (us && us->pusb_dev) { + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);Isn't there a symbolic constant you can use instead of "7"?
Quoted 7 lines
Quoted 2 lines
Nope.
lib/dynamic_debug:__dynamic_dev_dbg() does the same thing.This clearly is an omission in the logging API.
Kay, why doesn't the kernel have symbolic constants for the various logging facilities and levels?
Because they're so _very_ rarely used in decimal form.
printk.c, drivers/base/core.c, and net/core/dev.c sensibly use - '0', and I think dynamic_debug is the only other current user.
I suppose a new inline could be created something like
static inline int printk_get_level_decimal(const char *level)
{
if (printk_get_level(level)) {
switch (level[1]) {
case '0' ... '7':
return level[1] - '0';
}
}
return -1;
}PATCH 1/1 usb: storage: Convert US_DEBUGP to usb_stor_dbg
In reply to Alan SternUse 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
$ size drivers/usb/storage/built-in.o* text data bss dec hex filename 137787 55520 68584 261891 3ff03 drivers/usb/storage/built-in.o.debug.new 140782 55200 68904 264886 40ab6 drivers/usb/storage/built-in.o.debug.old 102709 54936 63784 221429 360f5 drivers/usb/storage/built-in.o.no_debug.new 101506 54568 63592 219666 35a12 drivers/usb/storage/built-in.o.no_debug.old
Increase in no_debug size is because some previously compiled-out US_DEBUGP are now dev_dbg and are compiled in and a couple of US_DEBUGP messages are now dev_info.
---
Compiled - untested
Addressed Alan Stern's notes.
drivers/usb/storage/alauda.c | 101 ++++++------- drivers/usb/storage/cypress_atacb.c | 2 +- drivers/usb/storage/datafab.c | 59 ++++---- drivers/usb/storage/debug.c | 28 ++-- drivers/usb/storage/debug.h | 17 ++- drivers/usb/storage/ene_ub6250.c | 86 +++++------ drivers/usb/storage/freecom.c | 85 +++++------ drivers/usb/storage/initializers.c | 10 +- drivers/usb/storage/isd200.c | 292 ++++++++++++++++++------------------ drivers/usb/storage/jumpshot.c | 69 ++++----- drivers/usb/storage/karma.c | 6 +- drivers/usb/storage/option_ms.c | 23 +-- drivers/usb/storage/realtek_cr.c | 128 ++++++---------- drivers/usb/storage/scsiglue.c | 13 +- drivers/usb/storage/sddr09.c | 146 +++++++++--------- drivers/usb/storage/sddr55.c | 86 +++++------ drivers/usb/storage/shuttle_usbat.c | 119 ++++++++------- drivers/usb/storage/sierra_ms.c | 43 +++--- drivers/usb/storage/transport.c | 181 +++++++++++----------- drivers/usb/storage/usb.c | 93 +++++------- 20 files changed, 753 insertions(+), 834 deletions(-)
drivers/usb/storage/alauda.c +45 -56
@@ -326,8 +326,7 @@ static int alauda_get_media_status(struct us_data *us, unsigned char *data) rc =usb_stor_ctrl_transfer (us, us->recv_ctrl_pipe, command,0xc0 ,0 ,1 , data,2 ); -US_DEBUGP ("alauda_get_media_status: Media status %02X %02X\n" , - data[0 ], data[1 ]); +usb_stor_dbg (us,"Media status %02X %02X\n" , data[0 ], data[1 ]);return rc; }
@@ -402,7 +401,7 @@ static int alauda_init_media(struct us_data *us) ready =1 ; } -US_DEBUGP ("alauda_init_media: We are ready for action!\n" ); +usb_stor_dbg (us,"We are ready for action!\n" );if (alauda_ack_media (us) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -413,15 +412,15 @@ static int alauda_init_media(struct us_data *us)return USB_STOR_TRANSPORT_ERROR ;if (data[0 ] !=0x14 ) { -US_DEBUGP ("alauda_init_media: Media not ready after ack\n" ); +usb_stor_dbg (us,"Media not ready after ack\n" );return USB_STOR_TRANSPORT_ERROR ; }if (alauda_get_media_signature (us, data) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; -US_DEBUGP ("alauda_init_media: Media signature: %02X %02X %02X %02X\n" , - data[0 ], data[1 ], data[2 ], data[3 ]); +usb_stor_dbg (us,"Media signature: %02X %02X %02X %02X\n" , + data[0 ], data[1 ], data[2 ], data[3 ]); media_info =alauda_card_find_id (data[1 ]);if (media_info ==NULL ) { printk(KERN_WARNING
@@ -432,8 +431,8 @@ static int alauda_init_media(struct us_data *us) }MEDIA_INFO (us).capacity =1 << media_info->chipshift; -US_DEBUGP ("Found media with capacity: %ldMB\n" , -MEDIA_INFO (us).capacity >>20 ); +usb_stor_dbg (us,"Found media with capacity: %ldMB\n" , +MEDIA_INFO (us).capacity >>20 );MEDIA_INFO (us).pageshift = media_info->pageshift;MEDIA_INFO (us).blockshift = media_info->blockshift;
@@ -472,7 +471,7 @@ static int alauda_check_media(struct us_data *us)/* Check for no media or door open */ if ((status[0 ] &0x80 ) || ((status[0 ] &0x1F ) ==0x10 ) || ((status[1 ] &0x01 ) ==0 )) { -US_DEBUGP ("alauda_check_media: No media, or door open\n" ); +usb_stor_dbg (us,"No media, or door open\n" );alauda_free_maps (&MEDIA_INFO (us)); info->sense_key =0x02 ; info->sense_asc =0x3A ;
@@ -482,7 +481,7 @@ static int alauda_check_media(struct us_data *us)/* Check for media change */ if (status[0 ] &0x08 ) { -US_DEBUGP ("alauda_check_media: Media change detected\n" ); +usb_stor_dbg (us,"Media change detected\n" );alauda_free_maps (&MEDIA_INFO (us));alauda_init_media (us);
@@ -518,7 +517,7 @@ static int alauda_check_status2(struct us_data *us)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_check_status2: %02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]); +usb_stor_dbg (us,"%02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]);if (data[0 ] &ALAUDA_STATUS_ERROR )return USB_STOR_XFER_ERROR ;
@@ -584,7 +583,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) goto error; } -US_DEBUGP ("alauda_read_map: Mapping blocks for zone %d\n" , zone); +usb_stor_dbg (us,"Mapping blocks for zone %d\n" , zone);/* 1024 PBA's per zone */ for (i =0 ; i < zonesize; i++)
@@ -604,7 +603,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone)if (data[j] !=0 ) goto nonz; pba_to_lba[i] =UNUSABLE ; -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping\n" , blocknum); +usb_stor_dbg (us,"PBA %d has no logical mapping\n" , blocknum);continue ; nonz:
@@ -617,19 +616,18 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) nonff:/* normal PBAs start with six FFs */ if (j <6 ) { -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping: " -"reserved area = %02X%02X%02X%02X " -"data status %02X block status %02X\n" , - blocknum, data[0 ], data[1 ], data[2 ], data[3 ], - data[4 ], data[5 ]); +usb_stor_dbg (us,"PBA %d has no logical mapping: reserved area = %02X%02X%02X%02X data status %02X block status %02X\n" , + blocknum, + data[0 ], data[1 ], data[2 ], data[3 ], + data[4 ], data[5 ]); pba_to_lba[i] =UNUSABLE ;continue ; }if ((data[6 ] >>4 ) !=0x01 ) { -US_DEBUGP ("alauda_read_map: PBA %d has invalid address " -"field %02X%02X/%02X%02X\n" , - blocknum, data[6 ], data[7 ], data[11 ], data[12 ]); +usb_stor_dbg (us,"PBA %d has invalid address field %02X%02X/%02X%02X\n" , + blocknum, data[6 ], data[7 ], + data[11 ], data[12 ]); pba_to_lba[i] =UNUSABLE ;continue ; }
@@ -711,7 +709,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba) };unsigned char buf[2 ]; -US_DEBUGP ("alauda_erase_block: Erasing PBA %d\n" , pba); +usb_stor_dbg (us,"Erasing PBA %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -723,8 +721,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_erase_block: Erase result: %02X %02X\n" , - buf[0 ], buf[1 ]); +usb_stor_dbg (us,"Erase result: %02X %02X\n" , buf[0 ], buf[1 ]);return rc; }
@@ -741,8 +738,7 @@ static int alauda_read_block_raw(struct us_data *us, u16 pba, PBA_ZONE(pba), 0, PBA_LO(pba) + page, pages, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_read_block: pba %d page %d count %d\n" , - pba, page, pages); +usb_stor_dbg (us,"pba %d page %d count %d\n" , pba, page, pages); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -793,7 +789,7 @@ static int alauda_write_block(struct us_data *us, u16 pba, unsigned char *data) PBA_ZONE(pba), 0, PBA_LO(pba), 32, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_write_block: pba %d\n" , pba); +usb_stor_dbg (us,"pba %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -866,14 +862,14 @@ static int alauda_write_lba(struct us_data *us, u16 lba, cptr = bptr + pagesize;nand_compute_ecc (bptr, ecc);if (!nand_compare_ecc (cptr+13 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d- of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d- of pba %d\n" , + i, pba);nand_store_ecc (cptr+13 , ecc); }nand_compute_ecc (bptr + (pagesize /2 ), ecc);if (!nand_compare_ecc (cptr+8 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d+ of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d+ of pba %d\n" , + i, pba);nand_store_ecc (cptr+8 , ecc); } cptr[6 ] = cptr[11 ] =MSB_of (lbap);
@@ -900,8 +896,7 @@ static int alauda_write_lba(struct us_data *us, u16 lba, new_pba_offset = new_pba - (zone * zonesize);MEDIA_INFO (us).pba_to_lba[zone][new_pba_offset] = lba;MEDIA_INFO (us).lba_to_pba[zone][lba_offset] = new_pba; -US_DEBUGP ("alauda_write_lba: Remapped LBA %d to PBA %d\n" , - lba, new_pba); +usb_stor_dbg (us,"Remapped LBA %d to PBA %d\n" , lba, new_pba);if (pba !=UNDEF ) {unsigned int pba_offset = pba - (zone * zonesize);
@@ -964,8 +959,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("Error: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Error: Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -978,8 +973,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address, pba =MEDIA_INFO (us).lba_to_pba[zone][lba_offset];if (pba ==UNDEF ) {/* this lba was never written */ -US_DEBUGP ("Read %d zero pages (LBA %d) page %d\n" , - pages, lba, page); +usb_stor_dbg (us,"Read %d zero pages (LBA %d) page %d\n" , + pages, lba, page);/* This is not really an error. It just means that the block has never been written.
@@ -988,9 +983,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,memset (buffer,0 , len); }else { -US_DEBUGP ("Read %d pages, from PBA %d" -" (LBA %d) page %d\n" , - pages, pba, lba, page); +usb_stor_dbg (us,"Read %d pages, from PBA %d (LBA %d) page %d\n" , + pages, pba, lba, page); result =alauda_read_block (us, pba, page, pages, buffer);if (result !=USB_STOR_TRANSPORT_GOOD )
@@ -1066,8 +1060,8 @@ static int alauda_write_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("alauda_write_data: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -1122,11 +1116,9 @@ static int init_alauda(struct us_data *us)nand_init_ecc (); us->extra =kzalloc (sizeof (struct alauda_info ),GFP_NOIO ); -if (!us->extra) { -US_DEBUGP ("init_alauda: Gah! Can't allocate storage for" -"alauda info struct!\n" ); +if (!us->extra)return USB_STOR_TRANSPORT_ERROR ; - } + info = (struct alauda_info *) us->extra; us->extra_destructor = alauda_info_destructor;
@@ -1147,15 +1139,14 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) };if (srb->cmnd[0 ] ==INQUIRY ) { -US_DEBUGP ("alauda_transport: INQUIRY. " -"Returning bogus response.\n" ); +usb_stor_dbg (us,"INQUIRY - Returning bogus response\n" );memcpy (ptr, inquiry_response,sizeof (inquiry_response));fill_inquiry_response (us, ptr,36 );return USB_STOR_TRANSPORT_GOOD ; }if (srb->cmnd[0 ] ==TEST_UNIT_READY ) { -US_DEBUGP ("alauda_transport: TEST_UNIT_READY.\n" ); +usb_stor_dbg (us,"TEST_UNIT_READY\n" );return alauda_check_media (us); }
@@ -1193,8 +1184,7 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: READ_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"READ_10: page %d pagect %d\n" , page, pages);return alauda_read_data (us, page, pages); }
@@ -1211,14 +1201,13 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: WRITE_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"WRITE_10: page %d pagect %d\n" , page, pages);return alauda_write_data (us, page, pages); }if (srb->cmnd[0 ] ==REQUEST_SENSE ) { -US_DEBUGP ("alauda_transport: REQUEST_SENSE.\n" ); +usb_stor_dbg (us,"REQUEST_SENSE\n" );memset (ptr,0 ,18 ); ptr[0 ] =0xF0 ;
@@ -1237,8 +1226,8 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us)return USB_STOR_TRANSPORT_GOOD ; } -US_DEBUGP ("alauda_transport: Gah! Unknown command: %d (0x%x)\n" , - srb->cmnd[0 ], srb->cmnd[0 ]); +usb_stor_dbg (us,"Gah! Unknown command: %d (0x%x)\n" , + srb->cmnd[0 ], srb->cmnd[0 ]); info->sense_key =0x05 ; info->sense_asc =0x20 ; info->sense_ascq =0x00 ;
drivers/usb/storage/cypress_atacb.c +1 -1
@@ -159,7 +159,7 @@ static void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)if (srb->result ==SAM_STAT_CHECK_CONDITION &&memcmp (srb->sense_buffer, usb_stor_sense_invalidCDB,sizeof (usb_stor_sense_invalidCDB)) ==0 ) { -US_DEBUGP ("cypress atacb not supported ???\n" ); +usb_stor_dbg (us,"cypress atacb not supported ???\n" ); goto end; }
drivers/usb/storage/datafab.c +30 -29
174 lines not on this page · raw message
drivers/usb/storage/debug.c +13 -15
@@ -42,16 +42,18 @@* 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/device.h> #include <linux/cdrom.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include "usb.h" #include "debug.h" #include "scsi.h" -void usb_stor_show_command (struct scsi_cmnd *srb) +void usb_stor_show_command (const struct us_data *us,struct scsi_cmnd *srb) {char *what =NULL ;int i;
@@ -149,18 +151,18 @@ void usb_stor_show_command(struct scsi_cmnd *srb)case WRITE_LONG_2 : what ="WRITE_LONG_2" ;break ;default : what ="(unknown command)" ;break ; } -US_DEBUGP ("Command %s (%d bytes)\n" , what, srb->cmd_len); -US_DEBUGP ("bytes: " ); +usb_stor_dbg (us,"Command %s (%d bytes)\n" , what, srb->cmd_len); +usb_stor_dbg (us,"bytes: " );for (i =0 ; i < srb->cmd_len && i <16 ; i++)US_DEBUGPX (" %02x" , srb->cmnd[i]);US_DEBUGPX ("\n" ); } -void usb_stor_show_sense ( -unsigned char key, -unsigned char asc, -unsigned char ascq) { - +void usb_stor_show_sense (const struct us_data *us, +unsigned char key, +unsigned char asc, +unsigned char ascq) +{const char *what, *keystr; keystr =scsi_sense_key_string (key);
@@ -171,23 +173,19 @@ void usb_stor_show_sense(if (what ==NULL ) what ="(unknown ASC/ASCQ)" ; -US_DEBUGP ("%s: " , keystr); +usb_stor_dbg (us,"%s: " , keystr);US_DEBUGPX (what, ascq);US_DEBUGPX ("\n" ); } -int usb_stor_dbg (const char *fmt, ...) +int usb_stor_dbg (const struct us_data *us,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); + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);va_end (args);
drivers/usb/storage/debug.h +10 -7
@@ -47,17 +47,20 @@#define USB_STORAGE "usb-storage: "#ifdef CONFIG_USB_STORAGE_DEBUG -void usb_stor_show_command (struct scsi_cmnd *srb); -void usb_stor_show_sense (unsigned char key, -unsigned char asc,unsigned char ascq ); -__printf(1, 2) int usb_stor_dbg(const char *fmt, ...); +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_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 (fmt, ...) \ - do { if (0) printk(fmt, ##__VA_ARGS__); } while (0) +__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)
drivers/usb/storage/ene_ub6250.c +43 -43
255 lines not on this page · raw message
drivers/usb/storage/freecom.c +43 -42
272 lines not on this page · raw message
drivers/usb/storage/initializers.c +5 -5
@@ -48,12 +48,12 @@ int usb_stor_euscsi_init(struct us_data *us) {int result; -US_DEBUGP ("Attempting to init eUSCSI bridge...\n" ); +usb_stor_dbg (us,"Attempting to init eUSCSI bridge...\n" ); us->iobuf[0 ] =0x1 ; result =usb_stor_control_msg (us, us->send_ctrl_pipe,0x0C ,USB_RECIP_INTERFACE |USB_TYPE_VENDOR ,0x01 ,0x0 , us->iobuf,0x1 ,5000 ); -US_DEBUGP ("-- result is %d\n" , result); +usb_stor_dbg (us,"-- result is %d\n" , result);return 0 ; }
@@ -68,7 +68,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)unsigned int partial;static char init_string[] ="\xec\x0a\x06\x00$PCCHIPS" ; -US_DEBUGP ("Sending UCR-61S2B initialization packet...\n" ); +usb_stor_dbg (us,"Sending UCR-61S2B initialization packet...\n" ); bcb->Signature =cpu_to_le32 (US_BULK_CB_SIGN ); bcb->Tag =0 ;
@@ -83,7 +83,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)if (res)return -EIO ; -US_DEBUGP ("Getting status packet...\n" ); +usb_stor_dbg (us,"Getting status packet...\n" ); res =usb_stor_bulk_transfer_buf (us, us->recv_bulk_pipe, bcs,US_BULK_CS_WRAP_LEN , &partial);if (res)
@@ -101,6 +101,6 @@ int usb_stor_huawei_e220_init(struct us_data *us)USB_REQ_SET_FEATURE ,USB_TYPE_STANDARD |USB_RECIP_DEVICE , 0x01, 0x0, NULL, 0x0, 1000); -US_DEBUGP ("Huawei mode set result is %d\n" , result); +usb_stor_dbg (us,"Huawei mode set result is %d\n" , result);return 0 ; }
drivers/usb/storage/isd200.c +148 -144
680 lines not on this page · raw message
drivers/usb/storage/jumpshot.c +35 -34
194 lines not on this page · raw message
drivers/usb/storage/karma.c +3 -3
@@ -106,7 +106,7 @@ static int rio_karma_send_command(char cmd, struct us_data *us)static unsigned char seq =1 ;struct karma_data *data = (struct karma_data *) us->extra; -US_DEBUGP ("karma: sending command %04x\n" , cmd); +usb_stor_dbg (us,"sending command %04x\n" , cmd);memset (us->iobuf,0 ,RIO_SEND_LEN );memcpy (us->iobuf,RIO_PREFIX ,RIO_PREFIX_LEN ); us->iobuf[5 ] = cmd;
@@ -139,10 +139,10 @@ static int rio_karma_send_command(char cmd, struct us_data *us)if (seq ==0 ) seq =1 ; -US_DEBUGP ("karma: sent command %04x\n" , cmd); +usb_stor_dbg (us,"sent command %04x\n" , cmd);return 0 ; err: -US_DEBUGP ("karma: command %04x failed\n" , cmd); +usb_stor_dbg (us,"command %04x failed\n" , cmd);return USB_STOR_TRANSPORT_FAILED ; }
drivers/usb/storage/option_ms.c +12 -11
@@ -50,7 +50,7 @@ static int option_rezero(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"DEVICE MODE SWITCH\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"DEVICE MODE SWITCH" ); buffer =kzalloc (RESPONSE_LEN ,GFP_KERNEL );if (buffer ==NULL )
@@ -95,7 +95,7 @@ static int option_inquiry(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"device inquiry for vendor name\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"device inquiry for vendor name" ); buffer =kzalloc (0x24 ,GFP_KERNEL );if (buffer ==NULL )
@@ -138,31 +138,32 @@ int option_ms_init(struct us_data *us) {int result; -US_DEBUGP ("Option MS: option_ms_init called\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"option_ms_init called" );/* Additional test for vendor information via INQUIRY, * because some vendor/product IDs are ambiguous */ result =option_inquiry (us);if (result !=0 ) { -US_DEBUGP ("Option MS: vendor is not Option or not determinable," -" no action taken\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"vendor is not Option or not determinable, no action taken" );return 0 ; }else -US_DEBUGP ("Option MS: this is a genuine Option device," -" proceeding\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"this is a genuine Option device, proceeding" );/* Force Modem mode */ if (option_zero_cd ==ZCD_FORCE_MODEM ) { -US_DEBUGP ("Option MS: %s" ,"Forcing Modem Mode\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"Forcing Modem Mode" ); result =option_rezero (us);if (result !=USB_STOR_XFER_GOOD ) -US_DEBUGP ("Option MS: Failed to switch to modem mode.\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Failed to switch to modem mode" );return -EIO ; }else if (option_zero_cd ==ZCD_ALLOW_MS ) {/* Allow Mass Storage mode (keep CD-Rom) */ -US_DEBUGP ("Option MS: %s" ,"Allowing Mass Storage Mode if device" -" requests it\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Allowing Mass Storage Mode if device requests it" ); }return 0 ;
drivers/usb/storage/realtek_cr.c +45 -83
357 lines not on this page · raw message
drivers/usb/storage/scsiglue.c +6 -7
@@ -313,8 +313,6 @@ static int queuecommand_lck(struct scsi_cmnd *srb, {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); -/* check for state-transition errors */ if (us->srb !=NULL ) { printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n",
@@ -324,7 +322,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb,/* fail the command if we are disconnecting */ if (test_bit (US_FLIDX_DISCONNECTING , &us->dflags)) { -US_DEBUGP ("Fail command during disconnect\n" ); +usb_stor_dbg (us,"Fail command during disconnect\n" ); srb->result =DID_NO_CONNECT <<16 ;done (srb);return 0 ;
@@ -349,7 +347,7 @@ static int command_abort(struct scsi_cmnd *srb) {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__);/* us->srb together with the TIMED_OUT, RESETTING, and ABORTING * bits are protected by the host lock. */
@@ -358,7 +356,7 @@ static int command_abort(struct scsi_cmnd *srb)/* Is this command still active? */ if (us->srb != srb) {scsi_unlock (us_to_host (us)); -US_DEBUGP ("-- nothing to abort\n" ); +usb_stor_dbg (us,"-- nothing to abort\n" );return FAILED ; }
@@ -386,7 +384,7 @@ static int device_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__);/* lock the device pointers and do the reset */ mutex_lock (&(us->dev_mutex));
@@ -402,7 +400,8 @@ static int bus_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__); + result =usb_stor_port_reset (us);return result <0 ?FAILED :SUCCESS ; }
drivers/usb/storage/sddr09.c +70 -76
379 lines not on this page · raw message
drivers/usb/storage/sddr55.c +40 -46
143 lines not on this page · raw message
drivers/usb/storage/shuttle_usbat.c +62 -57
119 lines not on this page · raw message
drivers/usb/storage/sierra_ms.c +18 -25
43 lines not on this page · raw message
drivers/usb/storage/transport.c +88 -93
181 lines not on this page · raw message
drivers/usb/storage/usb.c +36 -57
93 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerRe: [PATCH] usb: storage: Convert US_DEBUGP to usb_stor_dbg
Quoted 20 lines · Joe Perches
Use a more current logging style with
dev_printkwhere possible.o Convert uses of
US_DEBUGPtousb_stor_dbg
o Add "structus_data*" tousb_stor_dbguses
ousb_stor_dbgnow 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 someUS_DEBUGPuses todev_infoanddev_dbg$ size drivers/usb/storage/built-in.o* text data bss dec hex filename 137787 55520 68584 261891 3ff03 drivers/usb/storage/built-in.o.debug.new 140782 55200 68904 264886 40ab6 drivers/usb/storage/built-in.o.debug.old 102709 54936 63784 221429 360f5 drivers/usb/storage/built-in.o.no_debug.new 101506 54568 63592 219666 35a12 drivers/usb/storage/built-in.o.no_debug.old
Quoted 3 lines
Increase in
no_debugsize is because some previously compiled-outUS_DEBUGPare nowdev_dbgand are compiled in and a couple ofUS_DEBUGPmessages are nowdev_info.
With your other patch applied, this one seems to not apply to my tree:
checking file drivers/usb/storage/alauda.c checking file drivers/usb/storage/cypress_atacb.c checking file drivers/usb/storage/datafab.c checking file drivers/usb/storage/debug.c Hunk #1 FAILED at 42.
Hunk #2 succeeded at 150 (offset 1 line). Hunk #3 succeeded at 172 (offset 1 line). 1 out of 3 hunks FAILED
checking file drivers/usb/storage/debug.h checking file drivers/usb/storage/ene_ub6250.c checking file drivers/usb/storage/freecom.c checking file drivers/usb/storage/initializers.c checking file drivers/usb/storage/isd200.c checking file drivers/usb/storage/jumpshot.c checking file drivers/usb/storage/karma.c checking file drivers/usb/storage/option_ms.c checking file drivers/usb/storage/realtek_cr.c checking file drivers/usb/storage/scsiglue.c checking file drivers/usb/storage/sddr09.c checking file drivers/usb/storage/sddr55.c checking file drivers/usb/storage/shuttle_usbat.c checking file drivers/usb/storage/sierra_ms.c checking file drivers/usb/storage/transport.c checking file drivers/usb/storage/usb.c
Re: [PATCH] usb: storage: Convert US_DEBUGP to usb_stor_dbg
Quoted 3 lines · Greg Kroah-Hartman
Quoted 2 lines · Joe Perches
Use a more current logging style with
dev_printk
where possible.
[]
Quoted 1 line
With your other patch applied, this one seems to not apply to my tree:
I'll respin and resubmit.
PATCH v2 1/1 usb: storage: Convert US_DEBUGP to usb_stor_dbg
In reply to Greg Kroah-HartmanUse 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.
---
V2: Respun against usb-next with commit 0b25e2b9a7
("usb: storage: Fix link error")
drivers/usb/storage/alauda.c | 101 ++++++------- drivers/usb/storage/cypress_atacb.c | 2 +- drivers/usb/storage/datafab.c | 59 ++++---- drivers/usb/storage/debug.c | 28 ++-- drivers/usb/storage/debug.h | 17 ++- drivers/usb/storage/ene_ub6250.c | 86 +++++------ drivers/usb/storage/freecom.c | 85 +++++------ drivers/usb/storage/initializers.c | 10 +- drivers/usb/storage/isd200.c | 292 ++++++++++++++++++------------------ drivers/usb/storage/jumpshot.c | 69 ++++----- drivers/usb/storage/karma.c | 6 +- drivers/usb/storage/option_ms.c | 23 +-- drivers/usb/storage/realtek_cr.c | 128 ++++++---------- drivers/usb/storage/scsiglue.c | 13 +- drivers/usb/storage/sddr09.c | 146 +++++++++--------- drivers/usb/storage/sddr55.c | 86 +++++------ drivers/usb/storage/shuttle_usbat.c | 119 ++++++++------- drivers/usb/storage/sierra_ms.c | 43 +++--- drivers/usb/storage/transport.c | 181 +++++++++++----------- drivers/usb/storage/usb.c | 93 +++++------- 20 files changed, 753 insertions(+), 834 deletions(-)
drivers/usb/storage/alauda.c +45 -56
@@ -326,8 +326,7 @@ static int alauda_get_media_status(struct us_data *us, unsigned char *data) rc =usb_stor_ctrl_transfer (us, us->recv_ctrl_pipe, command,0xc0 ,0 ,1 , data,2 ); -US_DEBUGP ("alauda_get_media_status: Media status %02X %02X\n" , - data[0 ], data[1 ]); +usb_stor_dbg (us,"Media status %02X %02X\n" , data[0 ], data[1 ]);return rc; }
@@ -402,7 +401,7 @@ static int alauda_init_media(struct us_data *us) ready =1 ; } -US_DEBUGP ("alauda_init_media: We are ready for action!\n" ); +usb_stor_dbg (us,"We are ready for action!\n" );if (alauda_ack_media (us) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -413,15 +412,15 @@ static int alauda_init_media(struct us_data *us)return USB_STOR_TRANSPORT_ERROR ;if (data[0 ] !=0x14 ) { -US_DEBUGP ("alauda_init_media: Media not ready after ack\n" ); +usb_stor_dbg (us,"Media not ready after ack\n" );return USB_STOR_TRANSPORT_ERROR ; }if (alauda_get_media_signature (us, data) !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; -US_DEBUGP ("alauda_init_media: Media signature: %02X %02X %02X %02X\n" , - data[0 ], data[1 ], data[2 ], data[3 ]); +usb_stor_dbg (us,"Media signature: %02X %02X %02X %02X\n" , + data[0 ], data[1 ], data[2 ], data[3 ]); media_info =alauda_card_find_id (data[1 ]);if (media_info ==NULL ) { printk(KERN_WARNING
@@ -432,8 +431,8 @@ static int alauda_init_media(struct us_data *us) }MEDIA_INFO (us).capacity =1 << media_info->chipshift; -US_DEBUGP ("Found media with capacity: %ldMB\n" , -MEDIA_INFO (us).capacity >>20 ); +usb_stor_dbg (us,"Found media with capacity: %ldMB\n" , +MEDIA_INFO (us).capacity >>20 );MEDIA_INFO (us).pageshift = media_info->pageshift;MEDIA_INFO (us).blockshift = media_info->blockshift;
@@ -472,7 +471,7 @@ static int alauda_check_media(struct us_data *us)/* Check for no media or door open */ if ((status[0 ] &0x80 ) || ((status[0 ] &0x1F ) ==0x10 ) || ((status[1 ] &0x01 ) ==0 )) { -US_DEBUGP ("alauda_check_media: No media, or door open\n" ); +usb_stor_dbg (us,"No media, or door open\n" );alauda_free_maps (&MEDIA_INFO (us)); info->sense_key =0x02 ; info->sense_asc =0x3A ;
@@ -482,7 +481,7 @@ static int alauda_check_media(struct us_data *us)/* Check for media change */ if (status[0 ] &0x08 ) { -US_DEBUGP ("alauda_check_media: Media change detected\n" ); +usb_stor_dbg (us,"Media change detected\n" );alauda_free_maps (&MEDIA_INFO (us));alauda_init_media (us);
@@ -518,7 +517,7 @@ static int alauda_check_status2(struct us_data *us)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_check_status2: %02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]); +usb_stor_dbg (us,"%02X %02X %02X\n" , data[0 ], data[1 ], data[2 ]);if (data[0 ] &ALAUDA_STATUS_ERROR )return USB_STOR_XFER_ERROR ;
@@ -584,7 +583,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) goto error; } -US_DEBUGP ("alauda_read_map: Mapping blocks for zone %d\n" , zone); +usb_stor_dbg (us,"Mapping blocks for zone %d\n" , zone);/* 1024 PBA's per zone */ for (i =0 ; i < zonesize; i++)
@@ -604,7 +603,7 @@ static int alauda_read_map(struct us_data *us, unsigned int zone)if (data[j] !=0 ) goto nonz; pba_to_lba[i] =UNUSABLE ; -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping\n" , blocknum); +usb_stor_dbg (us,"PBA %d has no logical mapping\n" , blocknum);continue ; nonz:
@@ -617,19 +616,18 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) nonff:/* normal PBAs start with six FFs */ if (j <6 ) { -US_DEBUGP ("alauda_read_map: PBA %d has no logical mapping: " -"reserved area = %02X%02X%02X%02X " -"data status %02X block status %02X\n" , - blocknum, data[0 ], data[1 ], data[2 ], data[3 ], - data[4 ], data[5 ]); +usb_stor_dbg (us,"PBA %d has no logical mapping: reserved area = %02X%02X%02X%02X data status %02X block status %02X\n" , + blocknum, + data[0 ], data[1 ], data[2 ], data[3 ], + data[4 ], data[5 ]); pba_to_lba[i] =UNUSABLE ;continue ; }if ((data[6 ] >>4 ) !=0x01 ) { -US_DEBUGP ("alauda_read_map: PBA %d has invalid address " -"field %02X%02X/%02X%02X\n" , - blocknum, data[6 ], data[7 ], data[11 ], data[12 ]); +usb_stor_dbg (us,"PBA %d has invalid address field %02X%02X/%02X%02X\n" , + blocknum, data[6 ], data[7 ], + data[11 ], data[12 ]); pba_to_lba[i] =UNUSABLE ;continue ; }
@@ -711,7 +709,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba) };unsigned char buf[2 ]; -US_DEBUGP ("alauda_erase_block: Erasing PBA %d\n" , pba); +usb_stor_dbg (us,"Erasing PBA %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -723,8 +721,7 @@ static int alauda_erase_block(struct us_data *us, u16 pba)if (rc !=USB_STOR_XFER_GOOD )return rc; -US_DEBUGP ("alauda_erase_block: Erase result: %02X %02X\n" , - buf[0 ], buf[1 ]); +usb_stor_dbg (us,"Erase result: %02X %02X\n" , buf[0 ], buf[1 ]);return rc; }
@@ -741,8 +738,7 @@ static int alauda_read_block_raw(struct us_data *us, u16 pba, PBA_ZONE(pba), 0, PBA_LO(pba) + page, pages, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_read_block: pba %d page %d count %d\n" , - pba, page, pages); +usb_stor_dbg (us,"pba %d page %d count %d\n" , pba, page, pages); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -793,7 +789,7 @@ static int alauda_write_block(struct us_data *us, u16 pba, unsigned char *data) PBA_ZONE(pba), 0, PBA_LO(pba), 32, 0, MEDIA_PORT(us) }; -US_DEBUGP ("alauda_write_block: pba %d\n" , pba); +usb_stor_dbg (us,"pba %d\n" , pba); rc =usb_stor_bulk_transfer_buf (us, us->send_bulk_pipe, command,9 ,NULL );
@@ -866,14 +862,14 @@ static int alauda_write_lba(struct us_data *us, u16 lba, cptr = bptr + pagesize;nand_compute_ecc (bptr, ecc);if (!nand_compare_ecc (cptr+13 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d- of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d- of pba %d\n" , + i, pba);nand_store_ecc (cptr+13 , ecc); }nand_compute_ecc (bptr + (pagesize /2 ), ecc);if (!nand_compare_ecc (cptr+8 , ecc)) { -US_DEBUGP ("Warning: bad ecc in page %d+ of pba %d\n" , - i, pba); +usb_stor_dbg (us,"Warning: bad ecc in page %d+ of pba %d\n" , + i, pba);nand_store_ecc (cptr+8 , ecc); } cptr[6 ] = cptr[11 ] =MSB_of (lbap);
@@ -900,8 +896,7 @@ static int alauda_write_lba(struct us_data *us, u16 lba, new_pba_offset = new_pba - (zone * zonesize);MEDIA_INFO (us).pba_to_lba[zone][new_pba_offset] = lba;MEDIA_INFO (us).lba_to_pba[zone][lba_offset] = new_pba; -US_DEBUGP ("alauda_write_lba: Remapped LBA %d to PBA %d\n" , - lba, new_pba); +usb_stor_dbg (us,"Remapped LBA %d to PBA %d\n" , lba, new_pba);if (pba !=UNDEF ) {unsigned int pba_offset = pba - (zone * zonesize);
@@ -964,8 +959,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("Error: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Error: Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -978,8 +973,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address, pba =MEDIA_INFO (us).lba_to_pba[zone][lba_offset];if (pba ==UNDEF ) {/* this lba was never written */ -US_DEBUGP ("Read %d zero pages (LBA %d) page %d\n" , - pages, lba, page); +usb_stor_dbg (us,"Read %d zero pages (LBA %d) page %d\n" , + pages, lba, page);/* This is not really an error. It just means that the block has never been written.
@@ -988,9 +983,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address,memset (buffer,0 , len); }else { -US_DEBUGP ("Read %d pages, from PBA %d" -" (LBA %d) page %d\n" , - pages, pba, lba, page); +usb_stor_dbg (us,"Read %d pages, from PBA %d (LBA %d) page %d\n" , + pages, pba, lba, page); result =alauda_read_block (us, pba, page, pages, buffer);if (result !=USB_STOR_TRANSPORT_GOOD )
@@ -1066,8 +1060,8 @@ static int alauda_write_data(struct us_data *us, unsigned long address,/* Not overflowing capacity? */ if (lba >= max_lba) { -US_DEBUGP ("alauda_write_data: Requested lba %u exceeds " -"maximum %u\n" , lba, max_lba); +usb_stor_dbg (us,"Requested lba %u exceeds maximum %u\n" , + lba, max_lba); result =USB_STOR_TRANSPORT_ERROR ;break ; }
@@ -1122,11 +1116,9 @@ static int init_alauda(struct us_data *us)nand_init_ecc (); us->extra =kzalloc (sizeof (struct alauda_info ),GFP_NOIO ); -if (!us->extra) { -US_DEBUGP ("init_alauda: Gah! Can't allocate storage for" -"alauda info struct!\n" ); +if (!us->extra)return USB_STOR_TRANSPORT_ERROR ; - } + info = (struct alauda_info *) us->extra; us->extra_destructor = alauda_info_destructor;
@@ -1147,15 +1139,14 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) };if (srb->cmnd[0 ] ==INQUIRY ) { -US_DEBUGP ("alauda_transport: INQUIRY. " -"Returning bogus response.\n" ); +usb_stor_dbg (us,"INQUIRY - Returning bogus response\n" );memcpy (ptr, inquiry_response,sizeof (inquiry_response));fill_inquiry_response (us, ptr,36 );return USB_STOR_TRANSPORT_GOOD ; }if (srb->cmnd[0 ] ==TEST_UNIT_READY ) { -US_DEBUGP ("alauda_transport: TEST_UNIT_READY.\n" ); +usb_stor_dbg (us,"TEST_UNIT_READY\n" );return alauda_check_media (us); }
@@ -1193,8 +1184,7 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: READ_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"READ_10: page %d pagect %d\n" , page, pages);return alauda_read_data (us, page, pages); }
@@ -1211,14 +1201,13 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us) page |=short_pack (srb->cmnd[5 ], srb->cmnd[4 ]); pages =short_pack (srb->cmnd[8 ], srb->cmnd[7 ]); -US_DEBUGP ("alauda_transport: WRITE_10: page %d pagect %d\n" , - page, pages); +usb_stor_dbg (us,"WRITE_10: page %d pagect %d\n" , page, pages);return alauda_write_data (us, page, pages); }if (srb->cmnd[0 ] ==REQUEST_SENSE ) { -US_DEBUGP ("alauda_transport: REQUEST_SENSE.\n" ); +usb_stor_dbg (us,"REQUEST_SENSE\n" );memset (ptr,0 ,18 ); ptr[0 ] =0xF0 ;
@@ -1237,8 +1226,8 @@ static int alauda_transport(struct scsi_cmnd *srb, struct us_data *us)return USB_STOR_TRANSPORT_GOOD ; } -US_DEBUGP ("alauda_transport: Gah! Unknown command: %d (0x%x)\n" , - srb->cmnd[0 ], srb->cmnd[0 ]); +usb_stor_dbg (us,"Gah! Unknown command: %d (0x%x)\n" , + srb->cmnd[0 ], srb->cmnd[0 ]); info->sense_key =0x05 ; info->sense_asc =0x20 ; info->sense_ascq =0x00 ;
drivers/usb/storage/cypress_atacb.c +1 -1
@@ -159,7 +159,7 @@ static void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)if (srb->result ==SAM_STAT_CHECK_CONDITION &&memcmp (srb->sense_buffer, usb_stor_sense_invalidCDB,sizeof (usb_stor_sense_invalidCDB)) ==0 ) { -US_DEBUGP ("cypress atacb not supported ???\n" ); +usb_stor_dbg (us,"cypress atacb not supported ???\n" ); goto end; }
drivers/usb/storage/datafab.c +30 -29
174 lines not on this page · raw message
drivers/usb/storage/debug.c +13 -15
@@ -42,17 +42,19 @@* 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/device.h> #include <linux/cdrom.h> #include <linux/export.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include "usb.h" #include "debug.h" #include "scsi.h" -void usb_stor_show_command (struct scsi_cmnd *srb) +void usb_stor_show_command (const struct us_data *us,struct scsi_cmnd *srb) {char *what =NULL ;int i;
@@ -150,18 +152,18 @@ void usb_stor_show_command(struct scsi_cmnd *srb)case WRITE_LONG_2 : what ="WRITE_LONG_2" ;break ;default : what ="(unknown command)" ;break ; } -US_DEBUGP ("Command %s (%d bytes)\n" , what, srb->cmd_len); -US_DEBUGP ("bytes: " ); +usb_stor_dbg (us,"Command %s (%d bytes)\n" , what, srb->cmd_len); +usb_stor_dbg (us,"bytes: " );for (i =0 ; i < srb->cmd_len && i <16 ; i++)US_DEBUGPX (" %02x" , srb->cmnd[i]);US_DEBUGPX ("\n" ); } -void usb_stor_show_sense ( -unsigned char key, -unsigned char asc, -unsigned char ascq) { - +void usb_stor_show_sense (const struct us_data *us, +unsigned char key, +unsigned char asc, +unsigned char ascq) +{const char *what, *keystr; keystr =scsi_sense_key_string (key);
@@ -172,23 +174,19 @@ void usb_stor_show_sense(if (what ==NULL ) what ="(unknown ASC/ASCQ)" ; -US_DEBUGP ("%s: " , keystr); +usb_stor_dbg (us,"%s: " , keystr);US_DEBUGPX (what, ascq);US_DEBUGPX ("\n" ); } -int usb_stor_dbg (const char *fmt, ...) +int usb_stor_dbg (const struct us_data *us,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); + r =dev_vprintk_emit (7 , &us->pusb_dev->dev, fmt, args);va_end (args);
drivers/usb/storage/debug.h +10 -7
@@ -47,17 +47,20 @@#define USB_STORAGE "usb-storage: "#ifdef CONFIG_USB_STORAGE_DEBUG -void usb_stor_show_command (struct scsi_cmnd *srb); -void usb_stor_show_sense (unsigned char key, -unsigned char asc,unsigned char ascq ); -__printf(1, 2) int usb_stor_dbg(const char *fmt, ...); +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_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 (fmt, ...) \ - do { if (0) printk(fmt, ##__VA_ARGS__); } while (0) +__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)
drivers/usb/storage/ene_ub6250.c +43 -43
255 lines not on this page · raw message
drivers/usb/storage/freecom.c +43 -42
272 lines not on this page · raw message
drivers/usb/storage/initializers.c +5 -5
@@ -48,12 +48,12 @@ int usb_stor_euscsi_init(struct us_data *us) {int result; -US_DEBUGP ("Attempting to init eUSCSI bridge...\n" ); +usb_stor_dbg (us,"Attempting to init eUSCSI bridge...\n" ); us->iobuf[0 ] =0x1 ; result =usb_stor_control_msg (us, us->send_ctrl_pipe,0x0C ,USB_RECIP_INTERFACE |USB_TYPE_VENDOR ,0x01 ,0x0 , us->iobuf,0x1 ,5000 ); -US_DEBUGP ("-- result is %d\n" , result); +usb_stor_dbg (us,"-- result is %d\n" , result);return 0 ; }
@@ -68,7 +68,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)unsigned int partial;static char init_string[] ="\xec\x0a\x06\x00$PCCHIPS" ; -US_DEBUGP ("Sending UCR-61S2B initialization packet...\n" ); +usb_stor_dbg (us,"Sending UCR-61S2B initialization packet...\n" ); bcb->Signature =cpu_to_le32 (US_BULK_CB_SIGN ); bcb->Tag =0 ;
@@ -83,7 +83,7 @@ int usb_stor_ucr61s2b_init(struct us_data *us)if (res)return -EIO ; -US_DEBUGP ("Getting status packet...\n" ); +usb_stor_dbg (us,"Getting status packet...\n" ); res =usb_stor_bulk_transfer_buf (us, us->recv_bulk_pipe, bcs,US_BULK_CS_WRAP_LEN , &partial);if (res)
@@ -101,6 +101,6 @@ int usb_stor_huawei_e220_init(struct us_data *us)USB_REQ_SET_FEATURE ,USB_TYPE_STANDARD |USB_RECIP_DEVICE , 0x01, 0x0, NULL, 0x0, 1000); -US_DEBUGP ("Huawei mode set result is %d\n" , result); +usb_stor_dbg (us,"Huawei mode set result is %d\n" , result);return 0 ; }
drivers/usb/storage/isd200.c +148 -144
680 lines not on this page · raw message
drivers/usb/storage/jumpshot.c +35 -34
194 lines not on this page · raw message
drivers/usb/storage/karma.c +3 -3
@@ -106,7 +106,7 @@ static int rio_karma_send_command(char cmd, struct us_data *us)static unsigned char seq =1 ;struct karma_data *data = (struct karma_data *) us->extra; -US_DEBUGP ("karma: sending command %04x\n" , cmd); +usb_stor_dbg (us,"sending command %04x\n" , cmd);memset (us->iobuf,0 ,RIO_SEND_LEN );memcpy (us->iobuf,RIO_PREFIX ,RIO_PREFIX_LEN ); us->iobuf[5 ] = cmd;
@@ -139,10 +139,10 @@ static int rio_karma_send_command(char cmd, struct us_data *us)if (seq ==0 ) seq =1 ; -US_DEBUGP ("karma: sent command %04x\n" , cmd); +usb_stor_dbg (us,"sent command %04x\n" , cmd);return 0 ; err: -US_DEBUGP ("karma: command %04x failed\n" , cmd); +usb_stor_dbg (us,"command %04x failed\n" , cmd);return USB_STOR_TRANSPORT_FAILED ; }
drivers/usb/storage/option_ms.c +12 -11
@@ -50,7 +50,7 @@ static int option_rezero(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"DEVICE MODE SWITCH\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"DEVICE MODE SWITCH" ); buffer =kzalloc (RESPONSE_LEN ,GFP_KERNEL );if (buffer ==NULL )
@@ -95,7 +95,7 @@ static int option_inquiry(struct us_data *us)char *buffer;int result; -US_DEBUGP ("Option MS: %s" ,"device inquiry for vendor name\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"device inquiry for vendor name" ); buffer =kzalloc (0x24 ,GFP_KERNEL );if (buffer ==NULL )
@@ -138,31 +138,32 @@ int option_ms_init(struct us_data *us) {int result; -US_DEBUGP ("Option MS: option_ms_init called\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"option_ms_init called" );/* Additional test for vendor information via INQUIRY, * because some vendor/product IDs are ambiguous */ result =option_inquiry (us);if (result !=0 ) { -US_DEBUGP ("Option MS: vendor is not Option or not determinable," -" no action taken\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"vendor is not Option or not determinable, no action taken" );return 0 ; }else -US_DEBUGP ("Option MS: this is a genuine Option device," -" proceeding\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"this is a genuine Option device, proceeding" );/* Force Modem mode */ if (option_zero_cd ==ZCD_FORCE_MODEM ) { -US_DEBUGP ("Option MS: %s" ,"Forcing Modem Mode\n" ); +usb_stor_dbg (us,"Option MS: %s\n" ,"Forcing Modem Mode" ); result =option_rezero (us);if (result !=USB_STOR_XFER_GOOD ) -US_DEBUGP ("Option MS: Failed to switch to modem mode.\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Failed to switch to modem mode" );return -EIO ; }else if (option_zero_cd ==ZCD_ALLOW_MS ) {/* Allow Mass Storage mode (keep CD-Rom) */ -US_DEBUGP ("Option MS: %s" ,"Allowing Mass Storage Mode if device" -" requests it\n" ); +usb_stor_dbg (us,"Option MS: %s\n" , +"Allowing Mass Storage Mode if device requests it" ); }return 0 ;
drivers/usb/storage/realtek_cr.c +45 -83
357 lines not on this page · raw message
drivers/usb/storage/scsiglue.c +6 -7
@@ -313,8 +313,6 @@ static int queuecommand_lck(struct scsi_cmnd *srb, {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); -/* check for state-transition errors */ if (us->srb !=NULL ) { printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n",
@@ -324,7 +322,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb,/* fail the command if we are disconnecting */ if (test_bit (US_FLIDX_DISCONNECTING , &us->dflags)) { -US_DEBUGP ("Fail command during disconnect\n" ); +usb_stor_dbg (us,"Fail command during disconnect\n" ); srb->result =DID_NO_CONNECT <<16 ;done (srb);return 0 ;
@@ -349,7 +347,7 @@ static int command_abort(struct scsi_cmnd *srb) {struct us_data *us =host_to_us (srb->device->host); -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__);/* us->srb together with the TIMED_OUT, RESETTING, and ABORTING * bits are protected by the host lock. */
@@ -358,7 +356,7 @@ static int command_abort(struct scsi_cmnd *srb)/* Is this command still active? */ if (us->srb != srb) {scsi_unlock (us_to_host (us)); -US_DEBUGP ("-- nothing to abort\n" ); +usb_stor_dbg (us,"-- nothing to abort\n" );return FAILED ; }
@@ -386,7 +384,7 @@ static int device_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__);/* lock the device pointers and do the reset */ mutex_lock (&(us->dev_mutex));
@@ -402,7 +400,8 @@ static int bus_reset(struct scsi_cmnd *srb)struct us_data *us =host_to_us (srb->device->host);int result; -US_DEBUGP ("%s called\n" , __func__); +usb_stor_dbg (us,"%s called\n" , __func__); + result =usb_stor_port_reset (us);return result <0 ?FAILED :SUCCESS ; }
drivers/usb/storage/sddr09.c +70 -76
379 lines not on this page · raw message
drivers/usb/storage/sddr55.c +40 -46
142 lines not on this page · raw message
drivers/usb/storage/shuttle_usbat.c +62 -57
119 lines not on this page · raw message
drivers/usb/storage/sierra_ms.c +18 -25
43 lines not on this page · raw message
drivers/usb/storage/transport.c +88 -93
181 lines not on this page · raw message
drivers/usb/storage/usb.c +36 -57
93 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Part of the diff is not shown here. View the raw message.
Re: [PATCH V2] usb: storage: Convert US_DEBUGP to usb_stor_dbg
Quoted 17 lines · Joe Perches
drivers/usb/storage/realtek_cr.c +4
-2@@ -966,11 +934,13 @@ static int realtek_cr_autosuspend_setup(struct us_data *us)static void realtek_cr_destructor (void *extra) {struct rts51x_chip *chip = (struct rts51x_chip *)extra; - -US_DEBUGP ("%s: <---\n" , __func__); +struct us_data *us;if (!chip)return ; + + us = chip->us; +#ifdef CONFIG_REALTEK_AUTOPM if (ss_en) {del_timer (&chip->rts51x_suspend_timer);
Quoted 1 line
From linux-next:
drivers/usb/storage/realtek_cr.c: In function 'realtek_cr_destructor':drivers/usb/storage/realtek_cr.c:942:11: error: 'struct rts51x_chip' has no member named 'us'
chip->us here is only defined when CONFIG_REALTEK_AUTOPM is enabled.
Re: [PATCH V2] usb: storage: Convert US_DEBUGP to usb_stor_dbg
Quoted 19 lines · On Mon, 22 Apr 2013 12:35:26 -0700 (PDT) David Rientjes <[email protected]>…
Quoted 16 lines · Joe Perches
(quoted diff) +4
-2@@ -966,11 +934,13 @@ static int realtek_cr_autosuspend_setup(struct us_data *us) static void realtek_cr_destructor(void *extra) { struct rts51x_chip *chip = (struct rts51x_chip *)extra; - - US_DEBUGP("%s: <---\n", __func__); + struct us_data *us; if (!chip) return; + + us = chip->us; + #ifdef CONFIG_REALTEK_AUTOPM if (ss_en) { del_timer(&chip->rts51x_suspend_timer);
Quoted 6 lines
Quoted 1 line
From linux-next:
drivers/usb/storage/realtek_cr.c: In function 'realtek_cr_destructor':drivers/usb/storage/realtek_cr.c:942:11: error: 'structrts51x_chip' has no member named 'us'
chip->ushere is only defined whenCONFIG_REALTEK_AUTOPMis enabled.
local var `us' doesn't get used by anything and it's unclear why that patch added it?
From: Andrew Morton <[email protected]>
Subject: drivers/usb/storage/realtek_cr.c: fix build
Remove unused local `us', which broke the build. Also nuke an unneeded cast.
Repairs 191648d03d20 ("usb: storage: Convert US_DEBUGP to usb_stor_dbg").
---
drivers/usb/storage/realtek_cr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/usb/storage/realtek_cr.c renamed from drivers/usb/storage/realtek_cr.c~drivers-usb-storage-realtek_crc-fix-build +1 -4
@@ -933,14 +933,11 @@ static int realtek_cr_autosuspend_setup(static void realtek_cr_destructor (void *extra) { -struct rts51x_chip *chip = (struct rts51x_chip *)extra; -struct us_data *us; +struct rts51x_chip *chip = extra;if (!chip)return ; - us = chip->us; -#ifdef CONFIG_REALTEK_AUTOPM if (ss_en) {del_timer (&chip->rts51x_suspend_timer);
_
Left unfixed:
drivers/usb/storage/realtek_cr.c:628: warning: 'config_autodelink_before_power_down' defined but not used drivers/usb/storage/realtek_cr.c:698: warning: 'fw5895_init' defined but not used
David Rientjes
Acked-byRe: [PATCH V2] usb: storage: Convert US_DEBUGP to usb_stor_dbg
Quoted 6 lines · Andrew Morton
From: Andrew Morton <[email protected]>
Subject:drivers/usb/storage/realtek_cr.c: fix buildRemove unused local `us', which broke the build. Also nuke an unneeded cast.
Quoted 6 lines
Repairs
191648d03d20("usb: storage: ConvertUS_DEBUGPtousb_stor_dbg").Cc Joe Perches <[email protected]>Cc David Rientjes <[email protected]>Cc Greg KH <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Fixes it for me, thanks Andrew.