Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e265af1bfa48dbacfe5727237ce6d756ce96431e

Authored by Ravishankar Karkala Mallikarjunayya
Committed by Greg Kroah-Hartman
1 parent 4c234ebcf4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Staging: comedi: fix line over 80 character issue in usbduxfast.c 

This is a patch to the usbduxfast.c file that fixes up a line
over 80 character warning found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 20 additions and 17 deletions Side-by-side Diff

drivers/staging/comedi/drivers/usbduxfast.c
Diff comments   View file @ e265af1
... ... @@ -455,14 +455,15 @@
455 455 /* 7f92 to zero */
456 456 local_transfer_buffer[0] = 0;
457 457 /* bRequest, "Firmware" */
458   - ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
459   - VENDOR_DIR_OUT, /* bmRequestType */
460   - USBDUXFASTSUB_CPUCS, /* Value */
461   - 0x0000, /* Index */
462   - /* address of the transfer buffer */
463   - local_transfer_buffer,
464   - 1, /* Length */
465   - EZTIMEOUT); /* Timeout */
  458 + ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
  459 + USBDUXFASTSUB_FIRMWARE,
  460 + VENDOR_DIR_OUT, /* bmRequestType */
  461 + USBDUXFASTSUB_CPUCS, /* Value */
  462 + 0x0000, /* Index */
  463 + /* address of the transfer buffer */
  464 + local_transfer_buffer,
  465 + 1, /* Length */
  466 + EZTIMEOUT); /* Timeout */
466 467 if (ret < 0) {
467 468 printk("comedi_: usbduxfast_: control msg failed (start)\n");
468 469 return ret;
... ... @@ -479,7 +480,8 @@
479 480 /* 7f92 to one */
480 481 local_transfer_buffer[0] = 1;
481 482 /* bRequest, "Firmware" */
482   - ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
  483 + ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
  484 + USBDUXFASTSUB_FIRMWARE,
483 485 VENDOR_DIR_OUT, /* bmRequestType */
484 486 USBDUXFASTSUB_CPUCS, /* Value */
485 487 0x0000, /* Index */
... ... @@ -506,14 +508,15 @@
506 508 startAddr, local_transfer_buffer[0]);
507 509 #endif
508 510 /* brequest, firmware */
509   - ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
510   - VENDOR_DIR_OUT, /* bmRequestType */
511   - startAddr, /* value */
512   - 0x0000, /* index */
513   - /* our local safe buffer */
514   - local_transfer_buffer,
515   - len, /* length */
516   - EZTIMEOUT); /* timeout */
  511 + ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
  512 + USBDUXFASTSUB_FIRMWARE,
  513 + VENDOR_DIR_OUT, /* bmRequestType */
  514 + startAddr, /* value */
  515 + 0x0000, /* index */
  516 + /* our local safe buffer */
  517 + local_transfer_buffer,
  518 + len, /* length */
  519 + EZTIMEOUT); /* timeout */
517 520  
518 521 #ifdef CONFIG_COMEDI_DEBUG
519 522 printk(KERN_DEBUG "comedi_: usbduxfast: result=%d\n", ret);