linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
@ 2016-05-28  5:26 Ravishankar Karkala Mallikarjunayya
  2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
                   ` (5 more replies)
  0 siblings, 6 replies; 19+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2016-05-28  5:26 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya

This is a patch to the s626.c file that fixes up a type issues like
i.e Prefer kernel type 'u8' over 'uint8_t'
    Prefer kernel type 'u16' over 'uint16_t'
    Prefer kernel type 'u32' over 'uint32_t'
    Prefer kernel type 's16' over 'int16_t'
    Prefer kernel type 's32' over 'int32_t'
found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
---
changes since v1: Rework
---
 drivers/staging/comedi/drivers/s626.c | 212 +++++++++++++++++-----------------
 1 file changed, 106 insertions(+), 106 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index c5e0863..a399d7b 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -75,24 +75,24 @@ struct s626_buffer_dma {
 };
 
 struct s626_private {
-	uint8_t ai_cmd_running;		/* ai_cmd is running */
+	u8 ai_cmd_running;		/* ai_cmd is running */
 	unsigned int ai_sample_timer;	/* time between samples in
 					 * units of the timer */
 	int ai_convert_count;		/* conversion counter */
 	unsigned int ai_convert_timer;	/* time between conversion in
 					 * units of the timer */
-	uint16_t counter_int_enabs;	/* counter interrupt enable mask
+	u16 counter_int_enabs;		/* counter interrupt enable mask
 					 * for MISC2 register */
-	uint8_t adc_items;		/* number of items in ADC poll list */
+	u8 adc_items;			/* number of items in ADC poll list */
 	struct s626_buffer_dma rps_buf;	/* DMA buffer used to hold ADC (RPS1)
 					 * program */
 	struct s626_buffer_dma ana_buf;	/* DMA buffer used to receive ADC data
 					 * and hold DAC data */
-	uint32_t *dac_wbuf;		/* pointer to logical adrs of DMA buffer
+	u32 *dac_wbuf;			/* pointer to logical adrs of DMA buffer
 					 * used to hold DAC data */
-	uint16_t dacpol;		/* image of DAC polarity register */
-	uint8_t trim_setpoint[12];	/* images of TrimDAC setpoints */
-	uint32_t i2c_adrs;		/* I2C device address for onboard EEPROM
+	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) */
 };
 
@@ -304,10 +304,10 @@ static uint8_t s626_i2c_read(struct comedi_device *dev, uint8_t addr)
 /* ***********  DAC FUNCTIONS *********** */
 
 /* TrimDac LogicalChan-to-PhysicalChan mapping table. */
-static const uint8_t s626_trimchan[] = { 10, 9, 8, 3, 2, 7, 6, 1, 0, 5, 4 };
+static const u8 s626_trimchan[] = { 10, 9, 8, 3, 2, 7, 6, 1, 0, 5, 4 };
 
 /* TrimDac LogicalChan-to-EepromAdrs mapping table. */
-static const uint8_t s626_trimadrs[] = {
+static const u8 s626_trimadrs[] = {
 	0x40, 0x41, 0x42, 0x50, 0x51, 0x52, 0x53, 0x60, 0x61, 0x62, 0x63
 };
 
@@ -516,12 +516,12 @@ static int s626_send_dac(struct comedi_device *dev, uint32_t val)
  * Private helper function: Write setpoint to an application DAC channel.
  */
 static int s626_set_dac(struct comedi_device *dev,
-			uint16_t chan, int16_t dacdata)
+			u16 chan, s16 dacdata)
 {
 	struct s626_private *devpriv = dev->private;
-	uint16_t signmask;
-	uint32_t ws_image;
-	uint32_t val;
+	u16 signmask;
+	u32 ws_image;
+	u32 val;
 
 	/*
 	 * Adjust DAC data polarity and set up Polarity Control Register image.
@@ -535,7 +535,7 @@ static int s626_set_dac(struct comedi_device *dev,
 	}
 
 	/* Limit DAC setpoint value to valid range. */
-	if ((uint16_t)dacdata > 0x1FFF)
+	if ((u16)dacdata > 0x1FFF)
 		dacdata = 0x1FFF;
 
 	/*
@@ -575,23 +575,23 @@ static int s626_set_dac(struct comedi_device *dev,
 				 * (write to non-existent trimdac). */
 	val |= 0x00004000;	/* Address the two main dual-DAC devices
 				 * (TSL's chip select enables target device). */
-	val |= ((uint32_t)(chan & 1) << 15);	/* Address the DAC channel
+	val |= ((u32)(chan & 1) << 15);	/* Address the DAC channel
 						 * within the device. */
-	val |= (uint32_t)dacdata;	/* Include DAC setpoint data. */
+	val |= (u32)dacdata;	/* Include DAC setpoint data. */
 	return s626_send_dac(dev, val);
 }
 
 static int s626_write_trim_dac(struct comedi_device *dev,
-			       uint8_t logical_chan, uint8_t dac_data)
+			       u8 logical_chan, u8 dac_data)
 {
 	struct s626_private *devpriv = dev->private;
-	uint32_t chan;
+	u32 chan;
 
 	/*
 	 * Save the new setpoint in case the application needs to read it back
 	 * later.
 	 */
-	devpriv->trim_setpoint[logical_chan] = (uint8_t)dac_data;
+	devpriv->trim_setpoint[logical_chan] = (u8)dac_data;
 
 	/* Map logical channel number to physical channel number. */
 	chan = s626_trimchan[logical_chan];
@@ -633,7 +633,7 @@ static int s626_write_trim_dac(struct comedi_device *dev,
 
 static int s626_load_trim_dacs(struct comedi_device *dev)
 {
-	uint8_t i;
+	u8 i;
 	int ret;
 
 	/* Copy TrimDac setpoint values from EEPROM to TrimDacs. */
@@ -686,7 +686,7 @@ static void s626_preload(struct comedi_device *dev,
 static void s626_reset_cap_flags(struct comedi_device *dev,
 				 unsigned int chan)
 {
-	uint16_t set;
+	u16 set;
 
 	set = S626_SET_CRB_INTRESETCMD(1);
 	if (chan < 3)
@@ -702,12 +702,12 @@ static void s626_reset_cap_flags(struct comedi_device *dev,
  * Return counter setup in a format (COUNTER_SETUP) that is consistent
  * for both A and B counters.
  */
-static uint16_t s626_get_mode_a(struct comedi_device *dev,
-				unsigned int chan)
+static u16 s626_get_mode_a(struct comedi_device *dev,
+			   unsigned int chan)
 {
-	uint16_t cra;
-	uint16_t crb;
-	uint16_t setup;
+	u16 cra;
+	u16 crb;
+	u16 setup;
 	unsigned cntsrc, clkmult, clkpol, encmode;
 
 	/* Fetch CRA and CRB register images. */
@@ -757,12 +757,12 @@ static uint16_t s626_get_mode_a(struct comedi_device *dev,
 	return setup;
 }
 
-static uint16_t s626_get_mode_b(struct comedi_device *dev,
-				unsigned int chan)
+static u16 s626_get_mode_b(struct comedi_device *dev,
+			   unsigned int chan)
 {
-	uint16_t cra;
-	uint16_t crb;
-	uint16_t setup;
+	u16 cra;
+	u16 crb;
+	u16 setup;
 	unsigned cntsrc, clkmult, clkpol, encmode;
 
 	/* Fetch CRA and CRB register images. */
@@ -832,12 +832,12 @@ static uint16_t s626_get_mode(struct comedi_device *dev,
  * ClkPol, ClkEnab, IndexSrc, IndexPol, LoadSrc.
  */
 static void s626_set_mode_a(struct comedi_device *dev,
-			    unsigned int chan, uint16_t setup,
-			    uint16_t disable_int_src)
+			    unsigned int chan, u16 setup,
+			    u16 disable_int_src)
 {
 	struct s626_private *devpriv = dev->private;
-	uint16_t cra;
-	uint16_t crb;
+	u16 cra;
+	u16 crb;
 	unsigned cntsrc, clkmult, clkpol;
 
 	/* Initialize CRA and CRB images. */
@@ -910,12 +910,12 @@ static void s626_set_mode_a(struct comedi_device *dev,
 }
 
 static void s626_set_mode_b(struct comedi_device *dev,
-			    unsigned int chan, uint16_t setup,
-			    uint16_t disable_int_src)
+			    unsigned int chan, u16 setup,
+			    u16 disable_int_src)
 {
 	struct s626_private *devpriv = dev->private;
-	uint16_t cra;
-	uint16_t crb;
+	u16 cra;
+	u16 crb;
 	unsigned cntsrc, clkmult, clkpol;
 
 	/* Initialize CRA and CRB images. */
@@ -996,7 +996,7 @@ static void s626_set_mode_b(struct comedi_device *dev,
 
 static void s626_set_mode(struct comedi_device *dev,
 			  unsigned int chan,
-			  uint16_t setup, uint16_t disable_int_src)
+			  u16 setup, u16 disable_int_src)
 {
 	if (chan < 3)
 		s626_set_mode_a(dev, chan, setup, disable_int_src);
@@ -1024,10 +1024,10 @@ static void s626_set_enable(struct comedi_device *dev,
 }
 
 #ifdef unused
-static uint16_t s626_get_enable(struct comedi_device *dev,
-				unsigned int chan)
+static u16 s626_get_enable(struct comedi_device *dev,
+			   unsigned int chan)
 {
-	uint16_t crb = s626_debi_read(dev, S626_LP_CRB(chan));
+	u16 crb = s626_debi_read(dev, S626_LP_CRB(chan));
 
 	return (chan < 3) ? S626_GET_CRB_CLKENAB_A(crb)
 			  : S626_GET_CRB_CLKENAB_B(crb);
@@ -1035,8 +1035,8 @@ static uint16_t s626_get_enable(struct comedi_device *dev,
 #endif
 
 #ifdef unused
-static uint16_t s626_get_latch_source(struct comedi_device *dev,
-				      unsigned int chan)
+static u16 s626_get_latch_source(struct comedi_device *dev,
+				 unsigned int chan)
 {
 	return S626_GET_CRB_LATCHSRC(s626_debi_read(dev, S626_LP_CRB(chan)));
 }
@@ -1048,11 +1048,11 @@ static uint16_t s626_get_latch_source(struct comedi_device *dev,
  * 2=OverflowA (B counters only), 3=disabled.
  */
 static void s626_set_load_trig(struct comedi_device *dev,
-			       unsigned int chan, uint16_t trig)
+			       unsigned int chan, u16 trig)
 {
-	uint16_t reg;
-	uint16_t mask;
-	uint16_t set;
+	u16 reg;
+	u16 mask;
+	u16 set;
 
 	if (chan < 3) {
 		reg = S626_LP_CRA(chan);
@@ -1085,11 +1085,11 @@ static uint16_t s626_get_load_trig(struct comedi_device *dev,
  * 2=IndexOnly, 3=IndexAndOverflow.
  */
 static void s626_set_int_src(struct comedi_device *dev,
-			     unsigned int chan, uint16_t int_source)
+			     unsigned int chan, u16 int_source)
 {
 	struct s626_private *devpriv = dev->private;
-	uint16_t cra_reg = S626_LP_CRA(chan);
-	uint16_t crb_reg = S626_LP_CRB(chan);
+	u16 cra_reg = S626_LP_CRA(chan);
+	u16 crb_reg = S626_LP_CRB(chan);
 
 	if (chan < 3) {
 		/* Reset any pending counter overflow or index captures */
@@ -1101,7 +1101,7 @@ static void s626_set_int_src(struct comedi_device *dev,
 		s626_debi_replace(dev, cra_reg, ~S626_CRAMSK_INTSRC_A,
 				  S626_SET_CRA_INTSRC_A(int_source));
 	} else {
-		uint16_t crb;
+		u16 crb;
 
 		/* Cache writeable CRB register image */
 		crb = s626_debi_read(dev, crb_reg);
@@ -1156,9 +1156,9 @@ static uint16_t s626_get_int_src(struct comedi_device *dev,
  * Return/set the clock multiplier.
  */
 static void s626_set_clk_mult(struct comedi_device *dev,
-			      unsigned int chan, uint16_t value)
+			      unsigned int chan, u16 value)
 {
-	uint16_t mode;
+	u16 mode;
 
 	mode = s626_get_mode(dev, chan);
 	mode &= ~S626_STDMSK_CLKMULT;
@@ -1171,9 +1171,9 @@ static void s626_set_clk_mult(struct comedi_device *dev,
  * Return/set the clock polarity.
  */
 static void s626_set_clk_pol(struct comedi_device *dev,
-			     unsigned int chan, uint16_t value)
+			     unsigned int chan, u16 value)
 {
-	uint16_t mode;
+	u16 mode;
 
 	mode = s626_get_mode(dev, chan);
 	mode &= ~S626_STDMSK_CLKPOL;
@@ -1186,9 +1186,9 @@ static void s626_set_clk_pol(struct comedi_device *dev,
  * Return/set the encoder mode.
  */
 static void s626_set_enc_mode(struct comedi_device *dev,
-			      unsigned int chan, uint16_t value)
+			      unsigned int chan, u16 value)
 {
-	uint16_t mode;
+	u16 mode;
 
 	mode = s626_get_mode(dev, chan);
 	mode &= ~S626_STDMSK_ENCMODE;
@@ -1207,9 +1207,9 @@ static uint16_t s626_get_index_pol(struct comedi_device *dev,
  * Return/set the index source.
  */
 static void s626_set_index_src(struct comedi_device *dev,
-			       unsigned int chan, uint16_t value)
+			       unsigned int chan, u16 value)
 {
-	uint16_t mode;
+	u16 mode;
 
 	mode = s626_get_mode(dev, chan);
 	mode &= ~S626_STDMSK_INDXSRC;
@@ -1232,7 +1232,7 @@ static void s626_pulse_index(struct comedi_device *dev,
 			     unsigned int chan)
 {
 	if (chan < 3) {
-		uint16_t cra;
+		u16 cra;
 
 		cra = s626_debi_read(dev, S626_LP_CRA(chan));
 
@@ -1241,7 +1241,7 @@ static void s626_pulse_index(struct comedi_device *dev,
 				(cra ^ S626_CRAMSK_INDXPOL_A));
 		s626_debi_write(dev, S626_LP_CRA(chan), cra);
 	} else {
-		uint16_t crb;
+		u16 crb;
 
 		crb = s626_debi_read(dev, S626_LP_CRB(chan));
 		crb &= ~S626_CRBMSK_INTCTRL;
@@ -1309,7 +1309,7 @@ static int s626_dio_clear_irq(struct comedi_device *dev)
 }
 
 static void s626_handle_dio_interrupt(struct comedi_device *dev,
-				      uint16_t irqbit, uint8_t group)
+				      u16 irqbit, u8 group)
 {
 	struct s626_private *devpriv = dev->private;
 	struct comedi_subdevice *s = dev->read_subdev;
@@ -1357,8 +1357,8 @@ static void s626_handle_dio_interrupt(struct comedi_device *dev,
 
 static void s626_check_dio_interrupts(struct comedi_device *dev)
 {
-	uint16_t irqbit;
-	uint8_t group;
+	u16 irqbit;
+	u8 group;
 
 	for (group = 0; group < S626_DIO_BANKS; group++) {
 		/* read interrupt type */
@@ -1378,7 +1378,7 @@ static void s626_check_counter_interrupts(struct comedi_device *dev)
 	struct comedi_subdevice *s = dev->read_subdev;
 	struct comedi_async *async = s->async;
 	struct comedi_cmd *cmd = &async->cmd;
-	uint16_t irqbit;
+	u16 irqbit;
 
 	/* read interrupt type */
 	irqbit = s626_debi_read(dev, S626_LP_RDMISC2);
@@ -1443,7 +1443,7 @@ static bool s626_handle_eos_interrupt(struct comedi_device *dev)
 	 * first uint16_t in the buffer because it contains junk data
 	 * from the final ADC of the previous poll list scan.
 	 */
-	uint32_t *readaddr = (uint32_t *)devpriv->ana_buf.logical_base + 1;
+	u32 *readaddr = (u32 *)devpriv->ana_buf.logical_base + 1;
 	int i;
 
 	/* get the data and hand it over to comedi */
@@ -1478,7 +1478,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	unsigned long flags;
-	uint32_t irqtype, irqstatus;
+	u32 irqtype, irqstatus;
 
 	if (!dev->attached)
 		return IRQ_NONE;
@@ -1519,25 +1519,25 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 /*
  * This function builds the RPS program for hardware driven acquisition.
  */
-static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
+static void s626_reset_adc(struct comedi_device *dev, u8 *ppl)
 {
 	struct s626_private *devpriv = dev->private;
 	struct comedi_subdevice *s = dev->read_subdev;
 	struct comedi_cmd *cmd = &s->async->cmd;
-	uint32_t *rps;
-	uint32_t jmp_adrs;
-	uint16_t i;
-	uint16_t n;
-	uint32_t local_ppl;
+	u32 *rps;
+	u32 jmp_adrs;
+	u16 i;
+	u16 n;
+	u32 local_ppl;
 
 	/* Stop RPS program in case it is currently running */
 	s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1);
 
 	/* Set starting logical address to write RPS commands. */
-	rps = (uint32_t *)devpriv->rps_buf.logical_base;
+	rps = (u32 *)devpriv->rps_buf.logical_base;
 
 	/* Initialize RPS instruction pointer */
-	writel((uint32_t)devpriv->rps_buf.physical_base,
+	writel((u32)devpriv->rps_buf.physical_base,
 	       dev->mmio + S626_P_RPSADDR1);
 
 	/* Construct RPS program in rps_buf DMA buffer */
@@ -1619,8 +1619,8 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 		 * flushes the RPS' instruction prefetch pipeline.
 		 */
 		jmp_adrs =
-			(uint32_t)devpriv->rps_buf.physical_base +
-			(uint32_t)((unsigned long)rps -
+			(u32)devpriv->rps_buf.physical_base +
+			(u32)((unsigned long)rps -
 				   (unsigned long)devpriv->
 						  rps_buf.logical_base);
 		for (i = 0; i < (10 * S626_RPSCLK_PER_US / 2); i++) {
@@ -1655,7 +1655,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 		/* Transfer ADC data from FB BUFFER 1 register to DMA buffer. */
 		*rps++ = S626_RPS_STREG |
 			 (S626_BUGFIX_STREG(S626_P_FB_BUFFER1) >> 2);
-		*rps++ = (uint32_t)devpriv->ana_buf.physical_base +
+		*rps++ = (u32)devpriv->ana_buf.physical_base +
 			 (devpriv->adc_items << 2);
 
 		/*
@@ -1699,7 +1699,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 
 	/* Transfer final ADC data from FB BUFFER 1 register to DMA buffer. */
 	*rps++ = S626_RPS_STREG | (S626_BUGFIX_STREG(S626_P_FB_BUFFER1) >> 2);
-	*rps++ = (uint32_t)devpriv->ana_buf.physical_base +
+	*rps++ = (u32)devpriv->ana_buf.physical_base +
 		 (devpriv->adc_items << 2);
 
 	/* Indicate ADC scan loop is finished. */
@@ -1712,7 +1712,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 
 	/* Restart RPS program at its beginning. */
 	*rps++ = S626_RPS_JUMP;	/* Branch to start of RPS program. */
-	*rps++ = (uint32_t)devpriv->rps_buf.physical_base;
+	*rps++ = (u32)devpriv->rps_buf.physical_base;
 
 	/* End of RPS program build */
 }
@@ -1724,8 +1724,8 @@ static int s626_ai_rinsn(struct comedi_device *dev,
 			 unsigned int *data)
 {
 	struct s626_private *devpriv = dev->private;
-	uint8_t i;
-	int32_t *readaddr;
+	u8 i;
+	s32 *readaddr;
 
 	/* Trigger ADC scan loop start */
 	s626_mc_enable(dev, S626_MC2_ADC_RPS, S626_P_MC2);
@@ -1739,7 +1739,7 @@ static int s626_ai_rinsn(struct comedi_device *dev,
 	 * first uint16_t in the buffer because it contains junk data from
 	 * the final ADC of the previous poll list scan.
 	 */
-	readaddr = (uint32_t *)devpriv->ana_buf.logical_base + 1;
+	readaddr = (u32 *)devpriv->ana_buf.logical_base + 1;
 
 	/*
 	 * Convert ADC data to 16-bit integer values and
@@ -1772,11 +1772,11 @@ static int s626_ai_insn_read(struct comedi_device *dev,
 			     struct comedi_insn *insn,
 			     unsigned int *data)
 {
-	uint16_t chan = CR_CHAN(insn->chanspec);
-	uint16_t range = CR_RANGE(insn->chanspec);
-	uint16_t adc_spec = 0;
-	uint32_t gpio_image;
-	uint32_t tmp;
+	u16 chan = CR_CHAN(insn->chanspec);
+	u16 range = CR_RANGE(insn->chanspec);
+	u16 adc_spec = 0;
+	u32 gpio_image;
+	u32 tmp;
 	int ret;
 	int n;
 
@@ -1869,7 +1869,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,
 	return n;
 }
 
-static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_cmd *cmd)
+static int s626_ai_load_polllist(u8 *ppl, struct comedi_cmd *cmd)
 {
 	int n;
 
@@ -1935,7 +1935,7 @@ static int s626_ns_to_timer(unsigned int *nanosec, unsigned int flags)
 static void s626_timer_load(struct comedi_device *dev,
 			    unsigned int chan, int tick)
 {
-	uint16_t setup =
+	u16 setup =
 		/* Preload upon index. */
 		S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
 		/* Disable hardware index. */
@@ -1948,7 +1948,7 @@ static void s626_timer_load(struct comedi_device *dev,
 		S626_SET_STD_CLKMULT(S626_CLKMULT_1X) |
 		/* Enabled by index */
 		S626_SET_STD_CLKENAB(S626_CLKENAB_INDEX);
-	uint16_t value_latchsrc = S626_LATCHSRC_A_INDXA;
+	u16 value_latchsrc = S626_LATCHSRC_A_INDXA;
 	/* uint16_t enab = S626_CLKENAB_ALWAYS; */
 
 	s626_set_mode(dev, chan, setup, false);
@@ -1977,7 +1977,7 @@ static void s626_timer_load(struct comedi_device *dev,
 static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
 	struct s626_private *devpriv = dev->private;
-	uint8_t ppl[16];
+	u8 ppl[16];
 	struct comedi_cmd *cmd = &s->async->cmd;
 	int tick;
 
@@ -2212,7 +2212,7 @@ static int s626_ao_insn_write(struct comedi_device *dev,
 	int i;
 
 	for (i = 0; i < insn->n; i++) {
-		int16_t dacdata = (int16_t)data[i];
+	s16 dacdata = (s16)data[i];
 		int ret;
 
 		dacdata -= (0x1fff);
@@ -2237,7 +2237,7 @@ static int s626_ao_insn_write(struct comedi_device *dev,
 
 static void s626_dio_init(struct comedi_device *dev)
 {
-	uint16_t group;
+	u16 group;
 
 	/* Prepare to treat writes to WRCapSel as capture disables. */
 	s626_debi_write(dev, S626_LP_MISC1, S626_MISC1_NOEDCAP);
@@ -2301,7 +2301,7 @@ static int s626_enc_insn_config(struct comedi_device *dev,
 				struct comedi_insn *insn, unsigned int *data)
 {
 	unsigned int chan = CR_CHAN(insn->chanspec);
-	uint16_t setup =
+	u16 setup =
 		/* Preload upon index. */
 		S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
 		/* Disable hardware index. */
@@ -2316,8 +2316,8 @@ static int s626_enc_insn_config(struct comedi_device *dev,
 		S626_SET_STD_CLKENAB(S626_CLKENAB_INDEX);
 	/* uint16_t disable_int_src = true; */
 	/* uint32_t Preloadvalue;              //Counter initial value */
-	uint16_t value_latchsrc = S626_LATCHSRC_AB_READ;
-	uint16_t enab = S626_CLKENAB_ALWAYS;
+	u16 value_latchsrc = S626_LATCHSRC_AB_READ;
+	u16 enab = S626_CLKENAB_ALWAYS;
 
 	/* (data==NULL) ? (Preloadvalue=0) : (Preloadvalue=data[0]); */
 
@@ -2336,7 +2336,7 @@ static int s626_enc_insn_read(struct comedi_device *dev,
 			      unsigned int *data)
 {
 	unsigned int chan = CR_CHAN(insn->chanspec);
-	uint16_t cntr_latch_reg = S626_LP_CNTR(chan);
+	u16 cntr_latch_reg = S626_LP_CNTR(chan);
 	int i;
 
 	for (i = 0; i < insn->n; i++) {
@@ -2384,7 +2384,7 @@ static void s626_write_misc2(struct comedi_device *dev, uint16_t new_image)
 static void s626_counters_init(struct comedi_device *dev)
 {
 	int chan;
-	uint16_t setup =
+	u16 setup =
 		/* Preload upon index. */
 		S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
 		/* Disable hardware index. */
@@ -2453,7 +2453,7 @@ static int s626_initialize(struct comedi_device *dev)
 {
 	struct s626_private *devpriv = dev->private;
 	dma_addr_t phys_buf;
-	uint16_t chan;
+	u16 chan;
 	int i;
 	int ret;
 
@@ -2550,10 +2550,10 @@ static int s626_initialize(struct comedi_device *dev)
 	 */
 	{
 		struct comedi_subdevice *s = dev->read_subdev;
-		uint8_t poll_list;
-		uint16_t adc_data;
-		uint16_t start_val;
-		uint16_t index;
+		u8 poll_list;
+		u16 adc_data;
+		u16 start_val;
+		u16 index;
 		unsigned int data[16];
 
 		/* Create a simple polling list for analog input channel 0 */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 2/4] Staging: comedi: Fix WARNING issue in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
@ 2016-05-28  5:26 ` Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:11   ` Luis de Bethencourt
  2016-05-31 10:30   ` Ian Abbott
  2016-05-28  5:26 ` [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned " Ravishankar Karkala Mallikarjunayya
                   ` (4 subsequent siblings)
  5 siblings, 2 replies; 19+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2016-05-28  5:26 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya

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>
---
changes since v1: No change
---
 drivers/staging/comedi/drivers/s626.c | 60 +++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index a399d7b..edcd466 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -76,24 +76,38 @@ 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 */
+	unsigned int ai_sample_timer;	/*
+					 * time between samples in
+					 * 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 */
+	unsigned int ai_convert_timer;	/*
+					 * time between conversion in
+					 * 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 */
-	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 */
+	struct s626_buffer_dma rps_buf;	/*
+					 * DMA buffer used to hold ADC (RPS1)
+					 * 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
+					 */
 	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. */
@@ -571,12 +585,18 @@ static int s626_set_dac(struct comedi_device *dev,
 	 * to a  non-existent TrimDac channel) that serves to keep the clock
 	 * running after the packet has been sent to the target DAC.
 	 */
-	val = 0x0F000000;	/* Continue clock after target DAC data
-				 * (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. */
+	val = 0x0F000000;	/*
+				 * Continue clock after target DAC data
+				 * (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.
+					 */
 	val |= (u32)dacdata;	/* Include DAC setpoint data. */
 	return s626_send_dac(dev, val);
 }
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned issue in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
  2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
@ 2016-05-28  5:26 ` Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:15   ` Luis de Bethencourt
  2016-05-31 10:31   ` Ian Abbott
  2016-05-28  5:26 ` [PATCH v2 4/4] Staging: comedi: fix line over 80 characters " Ravishankar Karkala Mallikarjunayya
                   ` (3 subsequent siblings)
  5 siblings, 2 replies; 19+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2016-05-28  5:26 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya

This is a patch to the s626.c file that fixes up a
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
found by the checkpatch.pl tool

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
---
changes since v1: No change
---
 drivers/staging/comedi/drivers/s626.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index edcd466..790ca41 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -728,7 +728,7 @@ static u16 s626_get_mode_a(struct comedi_device *dev,
 	u16 cra;
 	u16 crb;
 	u16 setup;
-	unsigned cntsrc, clkmult, clkpol, encmode;
+	unsigned int cntsrc, clkmult, clkpol, encmode;
 
 	/* Fetch CRA and CRB register images. */
 	cra = s626_debi_read(dev, S626_LP_CRA(chan));
@@ -783,7 +783,7 @@ static u16 s626_get_mode_b(struct comedi_device *dev,
 	u16 cra;
 	u16 crb;
 	u16 setup;
-	unsigned cntsrc, clkmult, clkpol, encmode;
+	unsigned int cntsrc, clkmult, clkpol, encmode;
 
 	/* Fetch CRA and CRB register images. */
 	cra = s626_debi_read(dev, S626_LP_CRA(chan));
@@ -858,7 +858,7 @@ static void s626_set_mode_a(struct comedi_device *dev,
 	struct s626_private *devpriv = dev->private;
 	u16 cra;
 	u16 crb;
-	unsigned cntsrc, clkmult, clkpol;
+	unsigned int cntsrc, clkmult, clkpol;
 
 	/* Initialize CRA and CRB images. */
 	/* Preload trigger is passed through. */
@@ -936,7 +936,7 @@ static void s626_set_mode_b(struct comedi_device *dev,
 	struct s626_private *devpriv = dev->private;
 	u16 cra;
 	u16 crb;
-	unsigned cntsrc, clkmult, clkpol;
+	unsigned int cntsrc, clkmult, clkpol;
 
 	/* Initialize CRA and CRB images. */
 	/* IndexSrc is passed through. */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
  2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
  2016-05-28  5:26 ` [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned " Ravishankar Karkala Mallikarjunayya
@ 2016-05-28  5:26 ` Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:21   ` Luis de Bethencourt
  2016-05-31 10:31   ` Ian Abbott
  2016-05-30 14:01 ` [PATCH v2 1/4] staging : comedi : fix type issues " Luis de Bethencourt
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 19+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2016-05-28  5:26 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya

This is a patch to the s626.c file that fixes up a  line over 80
characters issues found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
---
changes since v1: No change
---
 drivers/staging/comedi/drivers/s626.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 790ca41..b5cd946 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2520,7 +2520,8 @@ static int s626_initialize(struct comedi_device *dev)
 	for (i = 0; i < 2; i++) {
 		writel(S626_I2C_CLKSEL, dev->mmio + S626_P_I2CSTAT);
 		s626_mc_enable(dev, S626_MC2_UPLD_IIC, S626_P_MC2);
-		ret = comedi_timeout(dev, NULL, NULL, s626_i2c_handshake_eoc, 0);
+		ret = comedi_timeout(dev, NULL, NULL, s626_i2c_handshake_eoc,
+				     0);
 		if (ret)
 			return ret;
 	}
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
                   ` (2 preceding siblings ...)
  2016-05-28  5:26 ` [PATCH v2 4/4] Staging: comedi: fix line over 80 characters " Ravishankar Karkala Mallikarjunayya
@ 2016-05-30 14:01 ` Luis de Bethencourt
  2016-05-31 10:29 ` Ian Abbott
  2016-06-18  3:53 ` Greg KH
  5 siblings, 0 replies; 19+ messages in thread
From: Luis de Bethencourt @ 2016-05-30 14:01 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a type issues like
> i.e Prefer kernel type 'u8' over 'uint8_t'
>     Prefer kernel type 'u16' over 'uint16_t'
>     Prefer kernel type 'u32' over 'uint32_t'
>     Prefer kernel type 's16' over 'int16_t'
>     Prefer kernel type 's32' over 'int32_t'
> found by the checkpatch.pl tool.
> 
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>

>From the CodingStyle [0]:

"Although it would only take a short amount of time for the eyes and
brain to become accustomed to the standard types like 'uint32_t',
some people object to their use anyway.

Therefore, the Linux-specific 'u8/u16/u32/u64' types and their
signed equivalents which are identical to standard types are
permitted -- although they are not mandatory in new code of your
own.

When editing existing code which already uses one or the other set
of types, you should conform to the existing choices in that code."

Not sure why checkpatch complains about this when the CodingStyle suggests
to conform to the choice in the existing code.

Anybody can shed some light on this?

Thanks,
Luis



[0] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/CodingStyle#n318

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 2/4] Staging: comedi: Fix WARNING issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
@ 2016-05-30 14:11   ` Luis de Bethencourt
  2016-05-31 10:30   ` Ian Abbott
  1 sibling, 0 replies; 19+ messages in thread
From: Luis de Bethencourt @ 2016-05-30 14:11 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> 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>

We can see in the diff this is making changes in s626.c :) no need to mention
that in the commit message.

Not sure moving the opening and closing of comments (/* and */) to a new line
makes things more readable. checkpatch is a great tool but it gives suggestions,
not hard rules.
Just a comment since I've seen multiple people follow checkpatch blindly, and
it is best to use your discretion.

Maintainer of this code will probably have a preference.

Thank you for your patches Ravishankar.

Luis

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned " Ravishankar Karkala Mallikarjunayya
@ 2016-05-30 14:15   ` Luis de Bethencourt
  2016-05-31 10:31   ` Ian Abbott
  1 sibling, 0 replies; 19+ messages in thread
From: Luis de Bethencourt @ 2016-05-30 14:15 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> found by the checkpatch.pl tool
> 
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>

The patch looks good :) adding the int makes it more verbose.

Just the same comment as the previous patch, we can see in the diff which file
is affected by this. You can just say:
"This fixes a WARNING: Prefer 'unsigned int' ..."

Thanks,
Luis

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 4/4] Staging: comedi: fix line over 80 characters " Ravishankar Karkala Mallikarjunayya
@ 2016-05-30 14:21   ` Luis de Bethencourt
  2016-06-18  3:51     ` Greg KH
  2016-05-31 10:31   ` Ian Abbott
  1 sibling, 1 reply; 19+ messages in thread
From: Luis de Bethencourt @ 2016-05-30 14:21 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a  line over 80
> characters issues found by the checkpatch.pl tool.
> 
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>

Looks good :)

This is the only instance of the line over 80 characters Warning in that file.

Like previous patches, no need to mention the file being fixed in the commit
message. It isn't a big deal though.

+1

Luis

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
                   ` (3 preceding siblings ...)
  2016-05-30 14:01 ` [PATCH v2 1/4] staging : comedi : fix type issues " Luis de Bethencourt
@ 2016-05-31 10:29 ` Ian Abbott
  2016-05-31 17:07   ` Joe Perches
  2016-06-18  3:53 ` Greg KH
  5 siblings, 1 reply; 19+ messages in thread
From: Ian Abbott @ 2016-05-31 10:29 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh; +Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a type issues like
> i.e Prefer kernel type 'u8' over 'uint8_t'
>      Prefer kernel type 'u16' over 'uint16_t'
>      Prefer kernel type 'u32' over 'uint32_t'
>      Prefer kernel type 's16' over 'int16_t'
>      Prefer kernel type 's32' over 'int32_t'
> found by the checkpatch.pl tool.
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> ---
> changes since v1: Rework
> ---
>   drivers/staging/comedi/drivers/s626.c | 212 +++++++++++++++++-----------------
>   1 file changed, 106 insertions(+), 106 deletions(-)
>

Thanks.  It would have been nice if the checkpatch.pl tool detected 
_all_ the instances of these types.  As a result of this patch, s626.c 
contains a mixture of the different integer type styles.  I guess we can 
fix that up later though.

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 2/4] Staging: comedi: Fix WARNING issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:11   ` Luis de Bethencourt
@ 2016-05-31 10:30   ` Ian Abbott
  1 sibling, 0 replies; 19+ messages in thread
From: Ian Abbott @ 2016-05-31 10:30 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh; +Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> 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>
> ---
> changes since v1: No change
> ---
>   drivers/staging/comedi/drivers/s626.c | 60 +++++++++++++++++++++++------------
>   1 file changed, 40 insertions(+), 20 deletions(-)
>

Thanks!

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned " Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:15   ` Luis de Bethencourt
@ 2016-05-31 10:31   ` Ian Abbott
  1 sibling, 0 replies; 19+ messages in thread
From: Ian Abbott @ 2016-05-31 10:31 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh; +Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> found by the checkpatch.pl tool
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> ---
> changes since v1: No change
> ---
>   drivers/staging/comedi/drivers/s626.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>

Thanks!

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-05-28  5:26 ` [PATCH v2 4/4] Staging: comedi: fix line over 80 characters " Ravishankar Karkala Mallikarjunayya
  2016-05-30 14:21   ` Luis de Bethencourt
@ 2016-05-31 10:31   ` Ian Abbott
  1 sibling, 0 replies; 19+ messages in thread
From: Ian Abbott @ 2016-05-31 10:31 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh; +Cc: devel, linux-kernel

On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a  line over 80
> characters issues found by the checkpatch.pl tool.
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> ---
> changes since v1: No change
> ---
>   drivers/staging/comedi/drivers/s626.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>

Thanks!

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
  2016-05-31 10:29 ` Ian Abbott
@ 2016-05-31 17:07   ` Joe Perches
  2016-06-01  9:28     ` Ian Abbott
  0 siblings, 1 reply; 19+ messages in thread
From: Joe Perches @ 2016-05-31 17:07 UTC (permalink / raw)
  To: Ian Abbott, Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh
  Cc: devel, linux-kernel

On Tue, 2016-05-31 at 11:29 +0100, Ian Abbott wrote:
> On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> > 
> > This is a patch to the s626.c file that fixes up a type issues like
> > i.e Prefer kernel type 'u8' over 'uint8_t'
> >      Prefer kernel type 'u16' over 'uint16_t'
> >      Prefer kernel type 'u32' over 'uint32_t'
> >      Prefer kernel type 's16' over 'int16_t'
> >      Prefer kernel type 's32' over 'int32_t'
> > found by the checkpatch.pl tool.
> > 
> > Signed-off-by: Ravishankar Karkala Mallikarjunayya 
> > ---
> > changes since v1: Rework
> > ---
> >   drivers/staging/comedi/drivers/s626.c | 212 +++++++++++++++++-----------------
> >   1 file changed, 106 insertions(+), 106 deletions(-)
> > 
> Thanks.  It would have been nice if the checkpatch.pl tool detected 
> _all_ the instances of these types.  As a result of this patch, s626.c 
> contains a mixture of the different integer type styles.  I guess we can 
> fix that up later though.

Seems trivial enough to do.

There was a possible issue with converting int_t types that
were used as uapi function arguments.

checkpatch currently warns only about variable declarations and
not function declarations.  It doesn't convert casts either.

Should it?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
  2016-05-31 17:07   ` Joe Perches
@ 2016-06-01  9:28     ` Ian Abbott
  0 siblings, 0 replies; 19+ messages in thread
From: Ian Abbott @ 2016-06-01  9:28 UTC (permalink / raw)
  To: Joe Perches, Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh
  Cc: devel, linux-kernel

On 31/05/16 18:07, Joe Perches wrote:
> On Tue, 2016-05-31 at 11:29 +0100, Ian Abbott wrote:
>> On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
>>>
>>> This is a patch to the s626.c file that fixes up a type issues like
>>> i.e Prefer kernel type 'u8' over 'uint8_t'
>>>       Prefer kernel type 'u16' over 'uint16_t'
>>>       Prefer kernel type 'u32' over 'uint32_t'
>>>       Prefer kernel type 's16' over 'int16_t'
>>>       Prefer kernel type 's32' over 'int32_t'
>>> found by the checkpatch.pl tool.
>>>
>>> Signed-off-by: Ravishankar Karkala Mallikarjunayya
>>> ---
>>> changes since v1: Rework
>>> ---
>>>    drivers/staging/comedi/drivers/s626.c | 212 +++++++++++++++++-----------------
>>>    1 file changed, 106 insertions(+), 106 deletions(-)
>>>
>> Thanks.  It would have been nice if the checkpatch.pl tool detected
>> _all_ the instances of these types.  As a result of this patch, s626.c
>> contains a mixture of the different integer type styles.  I guess we can
>> fix that up later though.
>
> Seems trivial enough to do.
>
> There was a possible issue with converting int_t types that
> were used as uapi function arguments.
>
> checkpatch currently warns only about variable declarations and
> not function declarations.  It doesn't convert casts either.

Oh right, I wasn't sure what the pattern was.  It does warn about int_t 
types in _some_function declarations, but on closer inspection, it only 
seems to do so when there is a line break before the parameter 
declaration.  For example:

CHECK: Prefer kernel type 'u16' over 'uint16_t'
#519: FILE: drivers/staging/comedi/drivers/s626.c:519:
+			uint16_t chan, int16_t dacdata)


-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-05-30 14:21   ` Luis de Bethencourt
@ 2016-06-18  3:51     ` Greg KH
  2016-06-18 14:21       ` Luis de Bethencourt
  0 siblings, 1 reply; 19+ messages in thread
From: Greg KH @ 2016-06-18  3:51 UTC (permalink / raw)
  To: Luis de Bethencourt
  Cc: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, devel,
	linux-kernel

On Mon, May 30, 2016 at 03:21:27PM +0100, Luis de Bethencourt wrote:
> On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
> > This is a patch to the s626.c file that fixes up a  line over 80
> > characters issues found by the checkpatch.pl tool.
> > 
> > Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> 
> Looks good :)
> 
> This is the only instance of the line over 80 characters Warning in that file.
> 
> Like previous patches, no need to mention the file being fixed in the commit
> message. It isn't a big deal though.
> 
> +1

Not much I can do with at "+1", please respond with a:
	Acked-by:
or even better:
	Reviewed-by:

with the proper info, so I can add it to the patch and give you credit
for reviewing it.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 1/4] staging : comedi : fix type issues in s626.c
  2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
                   ` (4 preceding siblings ...)
  2016-05-31 10:29 ` Ian Abbott
@ 2016-06-18  3:53 ` Greg KH
  5 siblings, 0 replies; 19+ messages in thread
From: Greg KH @ 2016-06-18  3:53 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya
  Cc: abbotti, hsweeten, devel, linux-kernel

On Sat, May 28, 2016 at 10:56:48AM +0530, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a type issues like
> i.e Prefer kernel type 'u8' over 'uint8_t'
>     Prefer kernel type 'u16' over 'uint16_t'
>     Prefer kernel type 'u32' over 'uint32_t'
>     Prefer kernel type 's16' over 'int16_t'
>     Prefer kernel type 's32' over 'int32_t'
> found by the checkpatch.pl tool.
> 
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
> ---
> changes since v1: Rework

This series doesn't apply at all, please rebase it and resend the whole
thing against the latest version of my staging-testing branch.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-06-18  3:51     ` Greg KH
@ 2016-06-18 14:21       ` Luis de Bethencourt
  0 siblings, 0 replies; 19+ messages in thread
From: Luis de Bethencourt @ 2016-06-18 14:21 UTC (permalink / raw)
  To: Greg KH
  Cc: Ravishankar Karkala Mallikarjunayya, abbotti, hsweeten, devel,
	linux-kernel

On 18/06/16 04:51, Greg KH wrote:
> On Mon, May 30, 2016 at 03:21:27PM +0100, Luis de Bethencourt wrote:
>> On 28/05/16 06:26, Ravishankar Karkala Mallikarjunayya wrote:
>>> This is a patch to the s626.c file that fixes up a  line over 80
>>> characters issues found by the checkpatch.pl tool.
>>>
>>> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
>>
>> Looks good :)
>>
>> This is the only instance of the line over 80 characters Warning in that file.
>>
>> Like previous patches, no need to mention the file being fixed in the commit
>> message. It isn't a big deal though.
>>
>> +1
> 
> Not much I can do with at "+1", please respond with a:
> 	Acked-by:
> or even better:
> 	Reviewed-by:
> 
> with the proper info, so I can add it to the patch and give you credit
> for reviewing it.
> 
> thanks,
> 
> greg k-h
> 

Reviewed-by: Luis de Bethencourt <luisbg@osg.samsung.com>

Sorry, sometimes I am not sure if my comments warrant an Acked-by/Reviewed-by.

Will always add one from now on.

Thanks :)
Luis

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
  2016-05-20  6:22 [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue " Ravishankar Karkala Mallikarjunayya
@ 2016-05-20 10:15 ` Ian Abbott
  0 siblings, 0 replies; 19+ messages in thread
From: Ian Abbott @ 2016-05-20 10:15 UTC (permalink / raw)
  To: Ravishankar Karkala Mallikarjunayya, hsweeten, gregkh; +Cc: devel, linux-kernel

On 20/05/16 07:22, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a  line over
> 80 characters issues found by the checkpatch.pl tool.
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
> ---
> Changes since V1:
> - No change
> ---
>   drivers/staging/comedi/drivers/s626.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Thanks!

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue in s626.c
@ 2016-05-20  6:22 Ravishankar Karkala Mallikarjunayya
  2016-05-20 10:15 ` Ian Abbott
  0 siblings, 1 reply; 19+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2016-05-20  6:22 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh
  Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya

This is a patch to the s626.c file that fixes up a  line over
80 characters issues found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@gmail.com>
---
Changes since V1:
- No change
---
 drivers/staging/comedi/drivers/s626.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 1d663a0..b37ba87 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2520,7 +2520,8 @@ static int s626_initialize(struct comedi_device *dev)
 	for (i = 0; i < 2; i++) {
 		writel(S626_I2C_CLKSEL, dev->mmio + S626_P_I2CSTAT);
 		s626_mc_enable(dev, S626_MC2_UPLD_IIC, S626_P_MC2);
-		ret = comedi_timeout(dev, NULL, NULL, s626_i2c_handshake_eoc, 0);
+		ret = comedi_timeout(dev, NULL, NULL, s626_i2c_handshake_eoc,
+				     0);
 		if (ret)
 			return ret;
 	}
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2016-06-18 14:21 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-28  5:26 [PATCH v2 1/4] staging : comedi : fix type issues in s626.c Ravishankar Karkala Mallikarjunayya
2016-05-28  5:26 ` [PATCH v2 2/4] Staging: comedi: Fix WARNING issue " Ravishankar Karkala Mallikarjunayya
2016-05-30 14:11   ` Luis de Bethencourt
2016-05-31 10:30   ` Ian Abbott
2016-05-28  5:26 ` [PATCH v2 3/4] Staging: comedi:Fix unsigned int to bare use of unsigned " Ravishankar Karkala Mallikarjunayya
2016-05-30 14:15   ` Luis de Bethencourt
2016-05-31 10:31   ` Ian Abbott
2016-05-28  5:26 ` [PATCH v2 4/4] Staging: comedi: fix line over 80 characters " Ravishankar Karkala Mallikarjunayya
2016-05-30 14:21   ` Luis de Bethencourt
2016-06-18  3:51     ` Greg KH
2016-06-18 14:21       ` Luis de Bethencourt
2016-05-31 10:31   ` Ian Abbott
2016-05-30 14:01 ` [PATCH v2 1/4] staging : comedi : fix type issues " Luis de Bethencourt
2016-05-31 10:29 ` Ian Abbott
2016-05-31 17:07   ` Joe Perches
2016-06-01  9:28     ` Ian Abbott
2016-06-18  3:53 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2016-05-20  6:22 [PATCH v2 4/4] Staging: comedi: fix line over 80 characters issue " Ravishankar Karkala Mallikarjunayya
2016-05-20 10:15 ` Ian Abbott

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).