[PATCH 2/2] staging:comedi: Fixed multiple file comment style

[PATCH 2/2] staging:comedi: Fixed multiple file comment style

[Cristina Moraru]

Fixed 'Block comments use * on subsequent lines' and 'Block comments use
a trailing */ on a separate line' Warnings

Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
---
 drivers/staging/comedi/comedidev.h | 33 +++++++++++++++++----------------
 drivers/staging/comedi/comedilib.h | 30 +++++++++++++++---------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 28a5d3a..c88f6e4 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -1,19 +1,19 @@
 /*
-    include/linux/comedidev.h
-    header file for kernel-only structures, variables, and constants
-
-    COMEDI - Linux Control and Measurement Device Interface
-    Copyright (C) 1997-2000 David A. Schleef <ds@schleef.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+ *    include/linux/comedidev.h
+ *   header file for kernel-only structures, variables, and constants
+ *
+ *   COMEDI - Linux Control and Measurement Device Interface
+ *   Copyright (C) 1997-2000 David A. Schleef <ds@schleef.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
 */
 
 #ifndef _COMEDIDEV_H
@@ -264,7 +264,8 @@ struct comedi_device {
 	unsigned int detach_count;
 	/* hw_dev is passed to dma_alloc_coherent when allocating async buffers
 	 * for subdevices that have async_dma_dir set to something other than
-	 * DMA_NONE */
+	 * DMA_NONE
+	*/
 	struct device *hw_dev;
 
 	const char *board_name;
diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h
index 56baf85..013446b 100644
--- a/drivers/staging/comedi/comedilib.h
+++ b/drivers/staging/comedi/comedilib.h
@@ -1,19 +1,19 @@
 /*
-    linux/include/comedilib.h
-    header file for kcomedilib
-
-    COMEDI - Linux Control and Measurement Device Interface
-    Copyright (C) 1998-2001 David A. Schleef <ds@schleef.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+ *   linux/include/comedilib.h
+ *   header file for kcomedilib
+ *
+ *   COMEDI - Linux Control and Measurement Device Interface
+ *   Copyright (C) 1998-2001 David A. Schleef <ds@schleef.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
 */
 
 #ifndef _LINUX_COMEDILIB_H
-- 
1.9.1

Re: [Outreachy kernel] [PATCH 2/2] staging:comedi: Fixed multiple file comment style

[Greg KH]

On Tue, Sep 29, 2015 at 02:50:18PM -0700, Cristina Moraru wrote:
> Fixed 'Block comments use * on subsequent lines' and 'Block comments use
> a trailing */ on a separate line' Warnings
> 
> Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
> ---
>  drivers/staging/comedi/comedidev.h | 33 +++++++++++++++++----------------
>  drivers/staging/comedi/comedilib.h | 30 +++++++++++++++---------------
>  2 files changed, 32 insertions(+), 31 deletions(-)

This patch fails to apply to my staging-testing branch for some reason.
I think because others already converted one of these files before you
set in this patch.

Can you please refresh your tree and rebase this and resend it against
my staging-testing git branch on my staging.git tree?

thanks,

greg k-h

Re: [Outreachy kernel] [PATCH 2/2] staging:comedi: Fixed multiple file comment style

[Julia Lawall]

On Tue, 29 Sep 2015, Cristina Moraru wrote:

> Fixed 'Block comments use * on subsequent lines' and 'Block comments use

Fixed -> Fix.  Use the imperative.

> + *    include/linux/comedidev.h
> + *   header file for kernel-only structures, variables, and constants

Normally there is only one space after the *.  Take a look at some other
non-staging drivers.

julia