Skip to contentSkip to conversation

Staging: comedi: adl_pci9118: commenting style issue fixed

PATCH In review Sam Asadi 2 participants 3 messages Jul 18, 2014 Staging

lore
Share & tools
lore

Sam Asadi

author
#0 lore raw

PATCH 1/2 Staging: comedi: adl_pci9118: commenting style issue fixed

A 'quoted string split across lines' issue fixed, while a better use of language applied to the comment.

---
 drivers/staging/comedi/drivers/adl_pci9118.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +1 -2
index 93bd9ee..7365f31 100644
@@ -418,8 +418,7 @@ static int check_channel_list(struct comedi_device *dev,
 			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
 			    (bipolar)) {
 				comedi_error(dev,
-					     "Bipolar and unipolar ranges "
-							"can't be mixtured!");
+					     "Bipolar and unipolar ranges can't be mixed!");
 				return 0;
 			}
 			if (!devpriv->usemux && differencial &&
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 Staging: comedi: adl_pci9118: line over 80 fixed

A 'line over 80 characters' issue fixed.

---
 drivers/staging/comedi/drivers/adl_pci9118.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/adl_pci9118.c +1 -1
index 7365f31..a715cd3 100644
@@ -346,7 +346,7 @@ struct pci9118_private {
 						 * on external start
 						 */
 	unsigned short ao_data[2];		/* data output buffer */
-	char dma_doublebuf;			/* we can use double buffering */
+	char dma_doublebuf;			/* use double buffering */
 	unsigned int dma_actbuf;		/* which buffer is used now */
 	unsigned short *dmabuf_virt[2];		/*
 						 * pointers to begin of
Signature · 1 line
1.7.10.4
maintainer
#2 lore raw
In reply to Sam Asadi
Quoted 13 lines · Sam Asadi

A 'quoted string split across lines' issue fixed, while a better use of language applied to the comment.

---
 drivers/staging/comedi/drivers/adl_pci9118.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +0 -0
index 93bd9ee..7365f31 100644

drivers/staging/comedi/drivers/adl_pci9118.c static int check_channel_list(struct comedi_device *dev, · line 421

Quoted 6 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1 -2
@@ -418,8 +418,7 @@ static int check_channel_list(struct comedi_device *dev,
 			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
 			    (bipolar)) {
 				comedi_error(dev,
-					     "Bipolar and unipolar ranges "
-							"can't be mixtured!");
+					     "Bipolar and unipolar ranges can't be mixed!");

What tree did you refresh this against? My staging-next branch of staging.git on git.kernel.org does not have comedi_error() anymore in it :(

thanks,

greg k-h