Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)

[karo-tx-linux.git] / drivers / usb / storage / isd200.c

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 39afd7045c43d3148ee746f428a89a99cb7ad458..fba4005dd737b9a43689ae1db1ecc20f3ac46ac7 100644 (file)
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1,4 +1,5 @@
-/* Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC
+/*
+ * Transport & Protocol Driver for In-System Design, Inc. ISD200 ASIC
  *
  * Current development and maintenance:
  *   (C) 2001-2002 Björn Stenberg (bjorn@haxx.se)
@@ -628,7 +629,8 @@ static void isd200_invoke_transport( struct us_data *us,
        srb->cmd_len = sizeof(ataCdb->generic);
        transferStatus = usb_stor_Bulk_transport(srb, us);
 
-       /* if the command gets aborted by the higher layers, we need to
+       /*
+        * if the command gets aborted by the higher layers, we need to
         * short-circuit all other processing
         */
        if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) {
@@ -695,15 +697,18 @@ static void isd200_invoke_transport( struct us_data *us,
                }
        }
 
-       /* Regardless of auto-sense, if we _know_ we have an error
+       /*
+        * Regardless of auto-sense, if we _know_ we have an error
         * condition, show that in the result code
         */
        if (transferStatus == USB_STOR_TRANSPORT_FAILED)
                srb->result = SAM_STAT_CHECK_CONDITION;
        return;
 
-       /* abort processing: the bulk-only transport requires a reset
-        * following an abort */
+       /*
+        * abort processing: the bulk-only transport requires a reset
+        * following an abort
+        */
        Handle_Abort:
        srb->result = DID_ABORT << 16;
 
@@ -965,20 +970,22 @@ static int isd200_try_enum(struct us_data *us, unsigned char master_slave,
                        info->DeviceHead = master_slave;
                        break;
                } 
-               /* check Cylinder High/Low to
-                  determine if it is an ATAPI device
-               */
+               /*
+                * check Cylinder High/Low to
+                * determine if it is an ATAPI device
+                */
                else if (regs[ATA_REG_HCYL_OFFSET] == 0xEB &&
                         regs[ATA_REG_LCYL_OFFSET] == 0x14) {
-                       /* It seems that the RICOH 
-                          MP6200A CD/RW drive will 
-                          report itself okay as a
-                          slave when it is really a
-                          master. So this check again
-                          as a master device just to
-                          make sure it doesn't report
-                          itself okay as a master also
-                       */
+                       /*
+                        * It seems that the RICOH
+                        * MP6200A CD/RW drive will
+                        * report itself okay as a
+                        * slave when it is really a
+                        * master. So this check again
+                        * as a master device just to
+                        * make sure it doesn't report
+                        * itself okay as a master also
+                        */
                        if ((master_slave & ATA_ADDRESS_DEVHEAD_SLAVE) &&
                            !recheckAsMaster) {
                                usb_stor_dbg(us, "   Identified ATAPI device as slave.  Rechecking again as master\n");
@@ -1176,9 +1183,11 @@ static int isd200_get_inquiry_data( struct us_data *us )
                                if (id[ATA_ID_COMMAND_SET_2] & COMMANDSET_MEDIA_STATUS) {
                                        usb_stor_dbg(us, "   Device supports Media Status Notification\n");
 
-                                       /* Indicate that it is enabled, even though it is not
-                                        * This allows the lock/unlock of the media to work
-                                        * correctly.
+                                       /*
+                                        * Indicate that it is enabled, even
+                                        * though it is not.
+                                        * This allows the lock/unlock of the
+                                        * media to work correctly.
                                         */
                                        info->DeviceFlags |= DF_MEDIA_STATUS_ENABLED;
                                }
@@ -1197,7 +1206,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
                        usb_stor_dbg(us, "Protocol changed to: %s\n",
                                     us->protocol_name);
            
-                       /* Free driver structure */         
+                       /* Free driver structure */
                        us->extra_destructor(info);
                        kfree(info);
                        us->extra = NULL;