usb: storage: Add usb_stor_dbg, reduce object size

[deliverable/linux.git] / drivers / usb / storage / isd200.c

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index ecea4787736463ccda4d1a498749eed74c2c9136..55571ae595928cc32894a409a97b1f1600c790b2 100644 (file)
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -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;
                        }
                }
@@ -1457,8 +1457,7 @@ static int isd200_init_info(struct us_data *us)
                retStatus = ISD200_ERROR;
        else {
                info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
-               info->RegsBuf = (unsigned char *)
-                               kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
+               info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
                info->srb.sense_buffer =
                                kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
                if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {