[PATCH v2] Staging: comedi: fix line longer than 80 chars in cb_pcidas64.c

[Amaury Denoyelle]

Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx> wrote:

> On Sun, May 17, 2015 at 04:47:23PM +0200, Amaury Denoyelle wrote:
> > This patch fixes coding style errors reported by checkpatch.pl for
> > cb_pcidas64.c, about too long source code lines.
> > 
> > Signed-off-by: Amaury Denoyelle <amaury.denoyelle@xxxxxxxxx>
> > ---
> <snip>
> >  }
> >  
> > -/* adjusts the size of hardware fifo (which determines block size for dma xfers) */
> > +/* adjusts the size of hardware fifo
> > + * (which determines block size for dma xfers) */
> 
> This is not the style for multi-line comments. Please check CodingStyle
> in Documentation.
> 
> >  static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
> >  {
> <snip>	
> >  
> > @@ -1987,8 +1990,8 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags)
> >  
> >  /* utility function that rounds desired timing to an achievable time, and
> >   * sets cmd members appropriately.
> > - * adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number
> > - */
> > + * adc paces conversions from master clock by dividing by (x + 3) where x is
> > + * 24 bit number */
> same here
> 
> and when you are sending just one patch, you do not need to mention
> [Patch 1/1] in the subject. just mention [Patch]
> 
> regards
> sudip

Thanks for your review. I was aware of the coding style for multi-line comments, but I chose to follow the same convention already used in the source file.

I submit a new version where I respect the coding style in the comments I fixed. I editted only multi-line comments that were too long, in order to not have a messy patch. If you think it's better to be done, maybe I could submit a two-part patch.

regards,

-- 
Amaury Denoyelle
From f91eadba14278565683f4ea950e94f69c2822c1d Mon Sep 17 00:00:00 2001
From: Amaury Denoyelle <amaury.denoyelle@xxxxxxxxx>
Date: Sun, 17 May 2015 15:53:50 +0200
Subject: [PATCH v2] Staging: comedi: fix line longer than 80 chars in
 cb_pcidas64.c

This patch fixes coding style errors reported by checkpatch.pl for
cb_pcidas64.c, about too long source code lines.
Adjust edited multi-line comments according to kernel coding style

Signed-off-by: Amaury Denoyelle <amaury.denoyelle@xxxxxxxxx>
---
 drivers/staging/comedi/drivers/cb_pcidas64.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index a94c33c..dc2d884 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -243,7 +243,8 @@ enum adc_control0_contents {
 	ADC_SOFT_GATE_BITS = 0x1,	/*  software gate */
 	ADC_EXT_GATE_BITS = 0x2,	/*  external digital gate */
 	ADC_ANALOG_GATE_BITS = 0x3,	/*  analog level gate */
-	ADC_GATE_LEVEL_BIT = 0x4,	/*  level-sensitive gate (for digital) */
+	/*  level-sensitive gate (for digital) */
+	ADC_GATE_LEVEL_BIT = 0x4,
 	ADC_GATE_POLARITY_BIT = 0x8,	/*  gate active low */
 	ADC_START_TRIG_SOFT_BITS = 0x10,
 	ADC_START_TRIG_EXT_BITS = 0x20,
@@ -1381,7 +1382,9 @@ static int set_ai_fifo_segment_length(struct comedi_device *dev,
 	return devpriv->ai_fifo_segment_length;
 }
 
-/* adjusts the size of hardware fifo (which determines block size for dma xfers) */
+/*
+ * adjusts the size of hardware fifo (which determines block size for dma xfers)
+ */
 static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples)
 {
 	const struct pcidas64_board *thisboard = dev->board_ptr;
@@ -1588,7 +1591,9 @@ static inline void warn_external_queue(struct comedi_device *dev)
 		"Use internal AI channel queue (channels must be consecutive and use same range/aref)\n");
 }
 
-/* Their i2c requires a huge delay on setting clock or data high for some reason */
+/*
+ * their i2c requires a huge delay on setting clock or data high for some reason
+ */
 static const int i2c_high_udelay = 1000;
 static const int i2c_low_udelay = 10;
 
@@ -1985,9 +1990,11 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags)
 	return divisor;
 }
 
-/* utility function that rounds desired timing to an achievable time, and
+/*
+ * utility function that rounds desired timing to an achievable time, and
  * sets cmd members appropriately.
- * adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number
+ * adc paces conversions from master clock by dividing by (x + 3) where x is
+ * 24 bit number
  */
 static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd)
 {
-- 
2.4.1