aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorJeffrin Jose <ahiliation@yahoo.co.in>2012-05-16 15:03:36 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-17 12:48:29 -0400
commita1631062f2f2e1b57108e810983a077d6b847092 (patch)
tree53748720faee64d1f0f10fa8c0dad5f88a816ecf /drivers/usb/storage
parenta7edf6823a76a06082ac1e60471706a380495f6c (diff)
USB: storage: fixed several trailing white spaces issues.
Fixed several trailing white spaces issues found by checkpatch.pl tool in drivers/usb/storage/usb.c Signed-off-by: Jeffrin Jose <ahiliation@yahoo.co.in> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/usb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 7ad1a8b2d80f..16d49da39459 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -121,7 +121,7 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks");
121} 121}
122 122
123static struct us_unusual_dev us_unusual_dev_list[] = { 123static struct us_unusual_dev us_unusual_dev_list[] = {
124# include "unusual_devs.h" 124# include "unusual_devs.h"
125 { } /* Terminating entry */ 125 { } /* Terminating entry */
126}; 126};
127 127
@@ -261,7 +261,7 @@ EXPORT_SYMBOL_GPL(usb_stor_post_reset);
261void fill_inquiry_response(struct us_data *us, unsigned char *data, 261void fill_inquiry_response(struct us_data *us, unsigned char *data,
262 unsigned int data_len) 262 unsigned int data_len)
263{ 263{
264 if (data_len<36) /* You lose. */ 264 if (data_len < 36) /* You lose. */
265 return; 265 return;
266 266
267 memset(data+8, ' ', 28); 267 memset(data+8, ' ', 28);
@@ -271,7 +271,7 @@ void fill_inquiry_response(struct us_data *us, unsigned char *data,
271 to this logical unit") and leave vendor and 271 to this logical unit") and leave vendor and
272 product identification empty. ("If the target 272 product identification empty. ("If the target
273 does store some of the INQUIRY data on the 273 does store some of the INQUIRY data on the
274 device, it may return zeros or ASCII spaces 274 device, it may return zeros or ASCII spaces
275 (20h) in those fields until the data is 275 (20h) in those fields until the data is
276 available from the device."). */ 276 available from the device."). */
277 } else { 277 } else {
@@ -327,7 +327,7 @@ static int usb_stor_control_thread(void * __us)
327 327
328 scsi_unlock(host); 328 scsi_unlock(host);
329 329
330 /* reject the command if the direction indicator 330 /* reject the command if the direction indicator
331 * is UNKNOWN 331 * is UNKNOWN
332 */ 332 */
333 if (us->srb->sc_data_direction == DMA_BIDIRECTIONAL) { 333 if (us->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
@@ -338,7 +338,7 @@ static int usb_stor_control_thread(void * __us)
338 /* reject if target != 0 or if LUN is higher than 338 /* reject if target != 0 or if LUN is higher than
339 * the maximum known LUN 339 * the maximum known LUN
340 */ 340 */
341 else if (us->srb->device->id && 341 else if (us->srb->device->id &&
342 !(us->fflags & US_FL_SCM_MULT_TARG)) { 342 !(us->fflags & US_FL_SCM_MULT_TARG)) {
343 US_DEBUGP("Bad target number (%d:%d)\n", 343 US_DEBUGP("Bad target number (%d:%d)\n",
344 us->srb->device->id, us->srb->device->lun); 344 us->srb->device->id, us->srb->device->lun);
@@ -351,7 +351,7 @@ static int usb_stor_control_thread(void * __us)
351 us->srb->result = DID_BAD_TARGET << 16; 351 us->srb->result = DID_BAD_TARGET << 16;
352 } 352 }
353 353
354 /* Handle those devices which need us to fake 354 /* Handle those devices which need us to fake
355 * their inquiry data */ 355 * their inquiry data */
356 else if ((us->srb->cmnd[0] == INQUIRY) && 356 else if ((us->srb->cmnd[0] == INQUIRY) &&
357 (us->fflags & US_FL_FIX_INQUIRY)) { 357 (us->fflags & US_FL_FIX_INQUIRY)) {
@@ -376,7 +376,7 @@ static int usb_stor_control_thread(void * __us)
376 376
377 /* indicate that the command is done */ 377 /* indicate that the command is done */
378 if (us->srb->result != DID_ABORT << 16) { 378 if (us->srb->result != DID_ABORT << 16) {
379 US_DEBUGP("scsi cmd done, result=0x%x\n", 379 US_DEBUGP("scsi cmd done, result=0x%x\n",
380 us->srb->result); 380 us->srb->result);
381 us->srb->scsi_done(us->srb); 381 us->srb->scsi_done(us->srb);
382 } else { 382 } else {
@@ -414,7 +414,7 @@ SkipForAbort:
414 } 414 }
415 __set_current_state(TASK_RUNNING); 415 __set_current_state(TASK_RUNNING);
416 return 0; 416 return 0;
417} 417}
418 418
419/*********************************************************************** 419/***********************************************************************
420 * Device probing and disconnecting 420 * Device probing and disconnecting
@@ -732,7 +732,7 @@ static int get_pipes(struct us_data *us)
732 us->recv_ctrl_pipe = usb_rcvctrlpipe(us->pusb_dev, 0); 732 us->recv_ctrl_pipe = usb_rcvctrlpipe(us->pusb_dev, 0);
733 us->send_bulk_pipe = usb_sndbulkpipe(us->pusb_dev, 733 us->send_bulk_pipe = usb_sndbulkpipe(us->pusb_dev,
734 usb_endpoint_num(ep_out)); 734 usb_endpoint_num(ep_out));
735 us->recv_bulk_pipe = usb_rcvbulkpipe(us->pusb_dev, 735 us->recv_bulk_pipe = usb_rcvbulkpipe(us->pusb_dev,
736 usb_endpoint_num(ep_in)); 736 usb_endpoint_num(ep_in));
737 if (ep_int) { 737 if (ep_int) {
738 us->recv_intr_pipe = usb_rcvintpipe(us->pusb_dev, 738 us->recv_intr_pipe = usb_rcvintpipe(us->pusb_dev,