Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1354882

[PATCH 2/5] Staging: comedi: fix WARNING issue in s626.c

Show key headers only | View raw

This is a patch to the s626.c file that fixes up a  Block comments issues
found by the checkpatch.pl tool.

i.e. Block comments use a trailing */ on a separate line

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
---
 drivers/staging/comedi/drivers/s626.c | 38 ++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 5469ca0..6ebae3a 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -77,23 +77,30 @@ struct s626_buffer_dma {
 struct s626_private {
 	u8 ai_cmd_running;		/* ai_cmd is running */
 	unsigned int ai_sample_timer;	/* time between samples in
-					 * units of the timer */
+					 * units of the timer
+					 */
 	int ai_convert_count;		/* conversion counter */
 	unsigned int ai_convert_timer;	/* time between conversion in
-					 * units of the timer */
-	u16 counter_int_enabs;	/* counter interrupt enable mask
-					 * for MISC2 register */
+					 * units of the timer
+					 */
+	u16 counter_int_enabs;		/* counter interrupt enable mask
+					 * for MISC2 register
+					 */
 	u8 adc_items;		/* number of items in ADC poll list */
 	struct s626_buffer_dma rps_buf;	/* DMA buffer used to hold ADC (RPS1)
-					 * program */
+					 * program
+					 */
 	struct s626_buffer_dma ana_buf;	/* DMA buffer used to receive ADC data
-					 * and hold DAC data */
-	u32 *dac_wbuf;		/* pointer to logical adrs of DMA buffer
-					 * used to hold DAC data */
+					 * and hold DAC data
+					 */
+	u32 *dac_wbuf;			/* pointer to logical adrs of DMA buffer
+					 * used to hold DAC data
+					 */
 	u16 dacpol;		/* image of DAC polarity register */
 	u8 trim_setpoint[12];	/* images of TrimDAC setpoints */
-	u32 i2c_adrs;		/* I2C device address for onboard EEPROM
-					 * (board rev dependent) */
+	u32 i2c_adrs;			/* I2C device address for onboard EEPROM
+					 * (board rev dependent)
+					 */
 };
 
 /* Counter overflow/index event flag masks for RDMISC2. */
@@ -572,11 +579,14 @@ static int s626_set_dac(struct comedi_device *dev,
 	 * running after the packet has been sent to the target DAC.
 	 */
 	val = 0x0F000000;	/* Continue clock after target DAC data
-				 * (write to non-existent trimdac). */
+				 * (write to non-existent trimdac).
+				 */
 	val |= 0x00004000;	/* Address the two main dual-DAC devices
-				 * (TSL's chip select enables target device). */
-	val |= ((u32)(chan & 1) << 15);	/* Address the DAC channel
-						 * within the device. */
+				 * (TSL's chip select enables target device).
+				 */
+	val |= ((u32)(chan & 1) << 15);		/* Address the DAC channel
+						 * within the device.
+						 */
 	val |= (u32)dacdata;	/* Include DAC setpoint data. */
 	return s626_send_dac(dev, val);
 }
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/5] Staging: comedi: fix WARNING issue in s626.c Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com> - 2016-03-10 08:00 +0100
  Re: [PATCH 2/5] Staging: comedi: fix WARNING issue in s626.c Greg KH <gregkh@linuxfoundation.org> - 2016-03-11 04:40 +0100

csiph-web