mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
usb: storage: freecom: Fixed several coding style issues.
Fixed several coding style issues in freecom.c. Signed-off-by: Martin Enderleit <menderleit@gmail.com> Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Cc: Daniel Mack <daniel@caiaq.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
8ca47c8a76
commit
7c7e2d0043
1 changed files with 11 additions and 12 deletions
|
@ -269,7 +269,7 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
|
||||||
/* The firmware will time-out commands after 20 seconds. Some commands
|
/* The firmware will time-out commands after 20 seconds. Some commands
|
||||||
* can legitimately take longer than this, so we use a different
|
* can legitimately take longer than this, so we use a different
|
||||||
* command that only waits for the interrupt and then sends status,
|
* command that only waits for the interrupt and then sends status,
|
||||||
* without having to send a new ATAPI command to the device.
|
* without having to send a new ATAPI command to the device.
|
||||||
*
|
*
|
||||||
* NOTE: There is some indication that a data transfer after a timeout
|
* NOTE: There is some indication that a data transfer after a timeout
|
||||||
* may not work, but that is a condition that should never happen.
|
* may not work, but that is a condition that should never happen.
|
||||||
|
@ -324,14 +324,14 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
|
||||||
|
|
||||||
/* Find the length we desire to read. */
|
/* Find the length we desire to read. */
|
||||||
switch (srb->cmnd[0]) {
|
switch (srb->cmnd[0]) {
|
||||||
case INQUIRY:
|
case INQUIRY:
|
||||||
case REQUEST_SENSE: /* 16 or 18 bytes? spec says 18, lots of devices only have 16 */
|
case REQUEST_SENSE: /* 16 or 18 bytes? spec says 18, lots of devices only have 16 */
|
||||||
case MODE_SENSE:
|
case MODE_SENSE:
|
||||||
case MODE_SENSE_10:
|
case MODE_SENSE_10:
|
||||||
length = le16_to_cpu(fst->Count);
|
length = le16_to_cpu(fst->Count);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
length = scsi_bufflen(srb);
|
length = scsi_bufflen(srb);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* verify that this amount is legal */
|
/* verify that this amount is legal */
|
||||||
|
@ -414,7 +414,7 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
|
||||||
/* should never hit here -- filtered in usb.c */
|
/* should never hit here -- filtered in usb.c */
|
||||||
US_DEBUGP ("freecom unimplemented direction: %d\n",
|
US_DEBUGP ("freecom unimplemented direction: %d\n",
|
||||||
us->srb->sc_data_direction);
|
us->srb->sc_data_direction);
|
||||||
// Return fail, SCSI seems to handle this better.
|
/* Return fail, SCSI seems to handle this better. */
|
||||||
return USB_STOR_TRANSPORT_FAILED;
|
return USB_STOR_TRANSPORT_FAILED;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -494,8 +494,7 @@ static void pdump (void *ibuffer, int length)
|
||||||
offset = 0;
|
offset = 0;
|
||||||
}
|
}
|
||||||
offset += sprintf (line+offset, "%08x:", i);
|
offset += sprintf (line+offset, "%08x:", i);
|
||||||
}
|
} else if ((i & 7) == 0) {
|
||||||
else if ((i & 7) == 0) {
|
|
||||||
offset += sprintf (line+offset, " -");
|
offset += sprintf (line+offset, " -");
|
||||||
}
|
}
|
||||||
offset += sprintf (line+offset, " %02x", buffer[i] & 0xff);
|
offset += sprintf (line+offset, " %02x", buffer[i] & 0xff);
|
||||||
|
|
Loading…
Reference in a new issue