Skip to contentSkip to conversation

Staging: comedi: adl_pci9118: a style issue fixed

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

lore
Share & tools
lore

Sam Asadi

author
#0 lore raw

PATCH 1/1 Staging: comedi: adl_pci9118: a style issue fixed

'quoted string split across lines' warning in checkpatching fixed by group whole string in one line.

---
 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 59a65cb..b2d25f5 100644
@@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
			if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
			    (differencial)) {
				comedi_error(dev,
-					     "Differencial and single ended "
-						"inputs can't be mixtured!");
+					     "Differencial and single ended inputs can't be mixtured!");
				return 0;
			}
			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=

--
1.7.10.4

#1 lore raw
Quoted 2 lines · Sam Asadi

'quoted string split across lines' warning in checkpatching fixed by group whole string in one line.

[]

drivers/staging/comedi/drivers/adl_pci9118.c

Quoted 1 line
drivers/staging/comedi/drivers/adl_pci9118.c +0 -0

[]

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

Quoted 7 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1 -2
@@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
 			if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
 			    (differencial)) {
 				comedi_error(dev,
-					     "Differencial and single ended "
-						"inputs can't be mixtured!");
+					     "Differencial and single ended inputs can't be mixtured!");

Might as well fix the fractured misspellings too.

maintainer
#2 lore raw
In reply to Sam Asadi
Quoted 13 lines · Sam Asadi

'quoted string split across lines' warning in checkpatching fixed by group whole string in one line.

---
 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 59a65cb..b2d25f5 100644

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

Quoted 10 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1 -3
@@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
 			if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
 			    (differencial)) {
 				comedi_error(dev,
-					     "Differencial and single ended "
-						"inputs can't be mixtured!");
+					     "Differencial and single ended inputs can't be mixtured!");
 				return 0;
 			}
 			if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
--

I get a very odd error when trying to apply this patch with git:

$ git am -s ../s1
Applying: Staging: comedi: adl_pci9118: a style issue fixed
fatal: corrupt patch at line 10
Patch failed at 0001 Staging: comedi: adl_pci9118: a style issue fixed
The copy of the patch that failed is found in:
   /home/gregkh/linux/work/staging/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Can you please fix this up and resend it in a format I can apply it in?

thanks,

greg k-h