Skip to contentSkip to conversation

Staging-comedi-fix-comments-over-80-issue-in-usbdu.patch

PATCH Stewart Robertson 1 participant 1 message Feb 27, 2010 Staging

lore
Share & tools
lore
#0 lore raw

One more for luck...

Not quite as much to fix in this one but I've still managed to iron out a few wrinkles. The remaining going over 80 characters warnings are instances of code, which I do not know how to wrap effectively.

Once again I have pasted it below and hopefully set Thunderbird to not mangle it but I have attached the patch in case it does.

Cheers,

Stewart

P.S. If someone could let me know whether the way the emails are arriving is okay or if I need to change the settings I am using I would appreciate it.

Quoted 1 line

From 20795e3686e8350e51ad24f8346093c42e39ddf1 Mon Sep 17 00:00:00 2001

From: Stewart Robertson <str@minty7.(none)>
Date: Sat, 27 Feb 2010 16:45:39 +0000
Subject: [PATCH] Staging: comedi: fix comments over 80 issue in usbduxfast.c This is a patch to the usbduxfast.c file that fixes comments over 80 warnings found by the checkpatch.pl tool

---
drivers/staging/comedi/drivers/usbduxfast.c | 44 +++++++++++++++-----------

1 files changed, 25 insertions(+), 19 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +0 -0
index 2e675cc..4e8ee6a 100644
@@ -178,8 +178,8 @@ struct usbduxfastsub_s {

int16_t *insnBuffer; /* input buffer for single insn */
int ifnum; /* interface number */
struct usb_interface *interface; /* interface structure */
- struct comedi_device *comedidev; /* comedi device for the interrupt
- context */
+ /* comedi device for the interrupt context */
+ struct comedi_device *comedidev;
short int ai_cmd_running; /* asynchronous command is running */
short int ai_continous; /* continous aquisition */
long int ai_sample_count; /* number of samples to aquire */
@@ -272,7 +272,8 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink)

	udfs->ai_cmd_running = 0;

	if (do_unlink)

- ret = usbduxfastsub_unlink_InURBs(udfs); /* stop aquistion */
+ /* stop aquistion */
+ ret = usbduxfastsub_unlink_InURBs(udfs);

	return ret;
}

@@ -452,13 +453,15 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)

	/* 7f92 to zero */
	local_transfer_buffer[0] = 0;
-	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,	/* bRequest, "Firmware" */
-			      VENDOR_DIR_OUT,	/* bmRequestType */
-			      USBDUXFASTSUB_CPUCS,	/* Value */
-			      0x0000,	/* Index */
-			      local_transfer_buffer,	/* address of the transfer buffer */
-			      1,	/* Length */
-			      EZTIMEOUT);	/* Timeout */

+ /* bRequest, "Firmware" */
+ ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
+ VENDOR_DIR_OUT, /* bmRequestType */
+ USBDUXFASTSUB_CPUCS, /* Value */
+ 0x0000, /* Index */
+ /* address of the transfer buffer */
+ local_transfer_buffer,
+ 1, /* Length */
+ EZTIMEOUT); /* Timeout */

	if (ret < 0) {
		printk("comedi_: usbduxfast_: control msg failed (start)\n");
		return ret;

@@ -474,7 +477,8 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)

	/* 7f92 to one */
	local_transfer_buffer[0] = 1;

- ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE, /* bRequest, "Firmware" */
+ /* bRequest, "Firmware" */
+ ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
VENDOR_DIR_OUT, /* bmRequestType */
USBDUXFASTSUB_CPUCS, /* Value */
0x0000, /* Index */
@@ -500,13 +504,15 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,

	printk(KERN_DEBUG " to addr %d, first byte=%d.\n",
	       startAddr, local_transfer_buffer[0]);
#endif
-	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,	/* brequest, firmware */
-			      VENDOR_DIR_OUT,	/* bmRequestType */
-			      startAddr,	/* value */
-			      0x0000,	/* index */
-			      local_transfer_buffer,	/* our local safe buffer */
-			      len,	/* length */
-			      EZTIMEOUT);	/* timeout */

+ /* brequest, firmware */
+ ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
+ VENDOR_DIR_OUT, /* bmRequestType */
+ startAddr, /* value */
+ 0x0000, /* index */
+ /* our local safe buffer */
+ local_transfer_buffer,
+ len, /* length */
+ EZTIMEOUT); /* timeout */

#ifdef CONFIG_COMEDI_DEBUG
	printk(KERN_DEBUG "comedi_: usbduxfast: result=%d\n", ret);

@@ -1348,7 +1354,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, #define FIRMWARE_MAX_LEN 0x2000

static int firmwareUpload(struct usbduxfastsub_s *usbduxfastsub,
- const u8 * firmwareBinary, int sizeFirmware)
+ const u8 *firmwareBinary, int sizeFirmware)

{
	int ret;
	uint8_t *fwBuf;
Signature · 1 line
1.6.0.4
Quoted 1 line

From 20795e3686e8350e51ad24f8346093c42e39ddf1 Mon Sep 17 00:00:00 2001

From: Stewart Robertson <str@minty7.(none)>
Date: Sat, 27 Feb 2010 16:45:39 +0000
Subject: [PATCH] Staging: comedi: fix comments over 80 issue in usbduxfast.c
This is a patch to the usbduxfast.c file that fixes comments over 80 warnings found by the checkpatch.pl tool

---
 drivers/staging/comedi/drivers/usbduxfast.c |   44 +++++++++++++++-----------
 1 files changed, 25 insertions(+), 19 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +25 -19

80 lines not on this page · raw message

Signature · 1 line
1.6.0.4