Re: [PATCH 2/2] Staging: comedi: fix type issue in s626.c

[Ian Abbott]

On 17/05/16 11:13, Ravishankar Karkala Mallikarjunayya wrote:
> This is a patch to the s626.c file that fixes up a type issues
> found by the checkpatch.pl tool.
>
> 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'
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankarkm32@xxxxxxxxx>
> ---
>   drivers/staging/comedi/drivers/s626.c | 152 +++++++++++++++++-----------------
>   1 file changed, 76 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
> index 0e1f535..c91ed53 100644
> --- a/drivers/staging/comedi/drivers/s626.c
> +++ b/drivers/staging/comedi/drivers/s626.c
> @@ -75,7 +75,7 @@ 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
> @@ -85,11 +85,11 @@ struct s626_private {
>   					 * time between conversion in
>   					 * units of the timer
>   					 */
> -	uint16_t counter_int_enabs;	/*
> +	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
> @@ -98,13 +98,13 @@ struct s626_private {
>   					 * DMA buffer used to receive ADC data
>   					 * and hold DAC data
>   					 */
> -	uint32_t *dac_wbuf;		/*
> +	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;		/*
> +	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)
>   					 */

This part of the patch fails to apply after your "[PATCH 1/2] Staging: 
comedi: Fix WARNING issue in s626.c" patch, because that patch already 
changed some of the types of the structure members.

At this point, it's probably best if you start again, and repost an 
updated, and self-consistent, version 2 of your original series of 4 
patches, tagged as "[PATCH v2 1/4]" etc.  At the moment, everything is 
too messed up.

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