2014-07-16 12:25:04

by Sam Asadi

Subject: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed

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

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 59a65cb..b2d25f5 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -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

2014-07-16 13:14:28

by Joe Perches

Subject: Re: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed

On Wed, 2014-07-16 at 15:24 +0300, Sam Asadi wrote:
> 'quoted string split across lines' warning in checkpatching fixed
> by group whole string in one line.
[]
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
[]
> @@ -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.

2014-07-16 20:29:21

by Greg Kroah-Hartman

Subject: Re: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed

On Wed, Jul 16, 2014 at 03:24:12PM +0300, Sam Asadi wrote:
> 'quoted string split across lines' warning in checkpatching fixed
> by group whole string in one line.
>
> Signed-off-by: Sam Asadi <[email protected]>
> ---
> drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
> index 59a65cb..b2d25f5 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9118.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9118.c
> @@ -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