1 files changed, 63 insertions, 35 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 9de988a0f856..ef2d8cde6ef7 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -1,4 +1,5 @@
-/* Driver for USB Mass Storage compliant devices
+/*
+ * Driver for USB Mass Storage compliant devices
  *
  * Current development and maintenance by:
  *   (c) 1999-2003 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
@@ -97,7 +98,8 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks");
  * with the entries in usb_storage_usb_ids[], defined in usual-tables.c.
  */
 
-/* The vendor name should be kept at eight characters or less, and
+/*
+ *The vendor name should be kept at eight characters or less, and
  * the product name should be kept at 16 characters or less. If a device
  * has the US_FL_FIX_INQUIRY flag, then the vendor and product names
  * normally generated by a device through the INQUIRY response will be
@@ -191,8 +193,10 @@ int usb_stor_suspend(struct usb_interface *iface, pm_message_t message)
         if (us->suspend_resume_hook)
                 (us->suspend_resume_hook)(us, US_SUSPEND);
 
-        /* When runtime PM is working, we'll set a flag to indicate
-         * whether we should autoresume when a SCSI request arrives. */
+        /*
+         * When runtime PM is working, we'll set a flag to indicate
+         * whether we should autoresume when a SCSI request arrives.
+         */
 
         mutex_unlock(&us->dev_mutex);
         return 0;
@@ -220,8 +224,10 @@ int usb_stor_reset_resume(struct usb_interface *iface)
         /* Report the reset to the SCSI core */
         usb_stor_report_bus_reset(us);
 
-        /* FIXME: Notify the subdrivers that they need to reinitialize
-         * the device */
+        /*
+         * FIXME: Notify the subdrivers that they need to reinitialize
+         * the device
+         */
         return 0;
 }
 EXPORT_SYMBOL_GPL(usb_stor_reset_resume);
@@ -250,8 +256,10 @@ int usb_stor_post_reset(struct usb_interface *iface)
         /* Report the reset to the SCSI core */
         usb_stor_report_bus_reset(us);
 
-        /* FIXME: Notify the subdrivers that they need to reinitialize
-         * the device */
+        /*
+         * FIXME: Notify the subdrivers that they need to reinitialize
+         * the device
+         */
 
         mutex_unlock(&us->dev_mutex);
         return 0;
@@ -274,15 +282,17 @@ void fill_inquiry_response(struct us_data *us, unsigned char *data,
                 return;
 
         memset(data+8, ' ', 28);
-        if (data[0]&0x20) { /* USB device currently not connected. Return
-                              peripheral qualifier 001b ("...however, the
-                              physical device is not currently connected
-                              to this logical unit") and leave vendor and
-                              product identification empty. ("If the target
-                              does store some of the INQUIRY data on the
-                              device, it may return zeros or ASCII spaces
-                              (20h) in those fields until the data is
-                              available from the device."). */
+        if (data[0]&0x20) { /*
+                             * USB device currently not connected. Return
+                             * peripheral qualifier 001b ("...however, the
+                             * physical device is not currently connected
+                             * to this logical unit") and leave vendor and
+                             * product identification empty. ("If the target
+                             * does store some of the INQUIRY data on the
+                             * device, it may return zeros or ASCII spaces
+                             * (20h) in those fields until the data is
+                             * available from the device.").
+                             */
         } else {
                 u16 bcdDevice = le16_to_cpu(us->pusb_dev->descriptor.bcdDevice);
                 int n;
@@ -336,7 +346,8 @@ static int usb_stor_control_thread(void * __us)
 
                 scsi_unlock(host);
 
-                /* reject the command if the direction indicator
+                /*
+                 * reject the command if the direction indicator
                  * is UNKNOWN
                  */
                 if (us->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
@@ -344,7 +355,8 @@ static int usb_stor_control_thread(void * __us)
                         us->srb->result = DID_ERROR << 16;
                 }
 
-                /* reject if target != 0 or if LUN is higher than
+                /*
+                 * reject if target != 0 or if LUN is higher than
                  * the maximum known LUN
                  */
                 else if (us->srb->device->id &&
@@ -362,8 +374,10 @@ static int usb_stor_control_thread(void * __us)
                         us->srb->result = DID_BAD_TARGET << 16;
                 }
 
-                /* Handle those devices which need us to fake
-                 * their inquiry data */
+                /*
+                 * Handle those devices which need us to fake
+                 * their inquiry data
+                 */
                 else if ((us->srb->cmnd[0] == INQUIRY) &&
                             (us->fflags & US_FL_FIX_INQUIRY)) {
                         unsigned char data_ptr[36] = {
@@ -395,11 +409,13 @@ SkipForAbort:
                         usb_stor_dbg(us, "scsi command aborted\n");
                 }
 
-                /* If an abort request was received we need to signal that
+                /*
+                 * If an abort request was received we need to signal that
                  * the abort has finished.  The proper test for this is
                  * the TIMED_OUT flag, not srb->result == DID_ABORT, because
                  * the timeout might have occurred after the command had
-                 * already completed with a different result code. */
+                 * already completed with a different result code.
+                 */
                 if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) {
                         complete(&(us->notify));
 
@@ -610,7 +626,8 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id,
                                 le16_to_cpu(dev->descriptor.idProduct),
                                 us->fflags);
 
-        /* Log a message if a non-generic unusual_dev entry contains an
+        /*
+         * Log a message if a non-generic unusual_dev entry contains an
          * unnecessary subclass or protocol override.  This may stimulate
          * reports from users that will help us remove unneeded entries
          * from the unusual_devs.h table.
@@ -782,8 +799,10 @@ static int usb_stor_acquire_resources(struct us_data *us)
                 return -ENOMEM;
         }
 
-        /* Just before we start our control thread, initialize
-         * the device if it needs initialization */
+        /*
+         * Just before we start our control thread, initialize
+         * the device if it needs initialization
+         */
         if (us->unusual_dev->initFunction) {
                 p = us->unusual_dev->initFunction(us);
                 if (p)
@@ -805,7 +824,8 @@ static int usb_stor_acquire_resources(struct us_data *us)
 /* Release all our dynamic resources */
 static void usb_stor_release_resources(struct us_data *us)
 {
-        /* Tell the control thread to exit.  The SCSI host must
+        /*
+         * Tell the control thread to exit.  The SCSI host must
          * already have been removed and the DISCONNECTING flag set
          * so that we won't accept any more commands.
          */
@@ -836,7 +856,8 @@ static void dissociate_dev(struct us_data *us)
         usb_set_intfdata(us->pusb_intf, NULL);
 }
 
-/* First stage of disconnect processing: stop SCSI scanning,
+/*
+ * First stage of disconnect processing: stop SCSI scanning,
  * remove the host, and stop accepting new commands
  */
 static void quiesce_and_remove_host(struct us_data *us)
@@ -849,7 +870,8 @@ static void quiesce_and_remove_host(struct us_data *us)
                 wake_up(&us->delay_wait);
         }
 
-        /* Prevent SCSI scanning (if it hasn't started yet)
+        /*
+         * Prevent SCSI scanning (if it hasn't started yet)
          * or wait for the SCSI-scanning routine to stop.
          */
         cancel_delayed_work_sync(&us->scan_dwork);
@@ -858,12 +880,14 @@ static void quiesce_and_remove_host(struct us_data *us)
         if (test_bit(US_FLIDX_SCAN_PENDING, &us->dflags))
                 usb_autopm_put_interface_no_suspend(us->pusb_intf);
 
-        /* Removing the host will perform an orderly shutdown: caches
+        /*
+         * Removing the host will perform an orderly shutdown: caches
          * synchronized, disks spun down, etc.
          */
         scsi_remove_host(host);
 
-        /* Prevent any new commands from being accepted and cut short
+        /*
+         * Prevent any new commands from being accepted and cut short
          * reset delays.
          */
         scsi_lock(host);
@@ -878,8 +902,10 @@ static void release_everything(struct us_data *us)
         usb_stor_release_resources(us);
         dissociate_dev(us);
 
-        /* Drop our reference to the host; the SCSI core will free it
-         * (and "us" along with it) when the refcount becomes 0. */
+        /*
+         * Drop our reference to the host; the SCSI core will free it
+         * (and "us" along with it) when the refcount becomes 0.
+         */
         scsi_host_put(us_to_host(us));
 }
 
@@ -900,7 +926,8 @@ static void usb_stor_scan_dwork(struct work_struct *work)
                 us->max_lun = usb_stor_Bulk_max_lun(us);
                 /*
                  * Allow proper scanning of devices that present more than 8 LUNs
-                 * While not affecting other devices that may need the previous behavior
+                 * While not affecting other devices that may need the previous
+                 * behavior
                  */
                 if (us->max_lun >= 8)
                         us_to_host(us)->max_lun = us->max_lun+1;
@@ -975,7 +1002,8 @@ int usb_stor_probe1(struct us_data **pus,
         get_transport(us);
         get_protocol(us);
 
-        /* Give the caller a chance to fill in specialized transport
+        /*
+         * Give the caller a chance to fill in specialized transport
          * or protocol settings.
          */
         return 0;