2014-07-18 20:13:18

by Sam Asadi

Subject: [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.

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 93bd9ee..7365f31 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -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 &&
--
1.7.10.4

2014-07-18 20:13:27

by Sam Asadi

Subject: [PATCH 2/2] Staging: comedi: adl_pci9118: line over 80 fixed

A 'line over 80 characters' issue fixed.

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

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 7365f31..a715cd3 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -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
--
1.7.10.4

2014-07-18 23:13:42

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] Staging: comedi: adl_pci9118: commenting style issue fixed

On Fri, Jul 18, 2014 at 11:13:07PM +0300, Sam Asadi wrote:
> A 'quoted string split across lines' issue fixed, while a better use of
> language applied to the comment.
>
> 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 93bd9ee..7365f31 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9118.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9118.c
> @@ -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