Skip to contentSkip to conversation

Staging:comedi:Fix bug and coding style issue in usbdux.c This is a patch to the usbdux.c file that resolve 2 errors in coding and fix the warning about lengt of code lines Signed-off-by: Morgan Gatti <[email protected]>

PATCH In review Morgan Gatti 2 participants 2 messages May 11, 2010 – May 12, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging:comedi:Fix bug and coding style issue in usbdux.c This is a patch to the usbdux.c file that resolve 2 errors in coding and fix the warning about lengt of code lines Signed-off-by: Morgan Gatti <[email protected]>

---
 drivers/staging/comedi/drivers/usbdux.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/comedi/drivers/usbdux.c +5 -5
index 8942ae4..c39c36a 100644
@@ -793,7 +793,7 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
 }
 
 static int usbduxsub_upload(struct usbduxsub *usbduxsub,
-			    uint8_t * local_transfer_buffer,
+			    uint8_t *local_transfer_buffer,
 			    unsigned int startAddr, unsigned int len)
 {
 	int errcode;
@@ -825,7 +825,7 @@ static int usbduxsub_upload(struct usbduxsub *usbduxsub,
 #define FIRMWARE_MAX_LEN 0x2000
 
 static int firmwareUpload(struct usbduxsub *usbduxsub,
-			  const u8 * firmwareBinary, int sizeFirmware)
+			  const u8 *firmwareBinary, int sizeFirmware)
 {
 	int ret;
 	uint8_t *fwBuf;
@@ -835,7 +835,7 @@ static int firmwareUpload(struct usbduxsub *usbduxsub,
 
 	if (sizeFirmware > FIRMWARE_MAX_LEN) {
 		dev_err(&usbduxsub->interface->dev,
-			"comedi_: usbdux firmware binary it too large for FX2.\n");
+		"comedi_: usbdux firmware binary it too large for FX2.\n");
 		return -ENOMEM;
 	}
 
@@ -1264,8 +1264,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 			    (this_usbduxsub->ai_interval) * 2;
 		}
 		this_usbduxsub->ai_timer = cmd->scan_begin_arg / (125000 *
-								  (this_usbduxsub->
-								   ai_interval));
+					  (this_usbduxsub->
+					   ai_interval));
 	} else {
 		/* interval always 1ms */
 		this_usbduxsub->ai_interval = 1;
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 3 lines · Morgan Gatti
---
 drivers/staging/comedi/drivers/usbdux.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Morgan,

please look into fixing you patch submission tools -- the whole changelog, including your Signed-off-by: line, ended up in Subject:, which is probably not what you intended.

Quoted 14 lines
drivers/staging/comedi/drivers/usbdux.c +1 -1
index 8942ae4..c39c36a 100644
@@ -793,7 +793,7 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
 }
 
 static int usbduxsub_upload(struct usbduxsub *usbduxsub,
-			    uint8_t * local_transfer_buffer,
+			    uint8_t *local_transfer_buffer,
 			    unsigned int startAddr, unsigned int len)
 {
 	int errcode;

drivers/staging/comedi/drivers/usbdux.c static int usbduxsub_upload(struct usbduxsub *usbduxsub, · line 828

Quoted 5 lines
drivers/staging/comedi/drivers/usbdux.c +1 -1
@@ -825,7 +825,7 @@ static int usbduxsub_upload(struct usbduxsub *usbduxsub,
 #define FIRMWARE_MAX_LEN 0x2000
 
 static int firmwareUpload(struct usbduxsub *usbduxsub,
-			  const u8 * firmwareBinary, int sizeFirmware)
+			  const u8 *firmwareBinary, int sizeFirmware)

While you are performing the glorious task of fixing the coding style in this driver, maybe also converting it not to use CamelNamingConvention would be worthwile.

Quoted 13 lines
drivers/staging/comedi/drivers/usbdux.c +1 -1
 {
 	int ret;
 	uint8_t *fwBuf;
@@ -835,7 +835,7 @@ static int firmwareUpload(struct usbduxsub *usbduxsub,
 
 	if (sizeFirmware > FIRMWARE_MAX_LEN) {
 		dev_err(&usbduxsub->interface->dev,
-			"comedi_: usbdux firmware binary it too large for FX2.\n");
+		"comedi_: usbdux firmware binary it too large for FX2.\n");
 		return -ENOMEM;
 	}
 

drivers/staging/comedi/drivers/usbdux.c static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) · line 1268

Quoted 7 lines
drivers/staging/comedi/drivers/usbdux.c +2 -2
@@ -1264,8 +1264,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 			    (this_usbduxsub->ai_interval) * 2;
 		}
 		this_usbduxsub->ai_timer = cmd->scan_begin_arg / (125000 *
-								  (this_usbduxsub->
-								   ai_interval));
+					  (this_usbduxsub->
+					   ai_interval));

Pasting this to one line would improve readability.

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.