Re: [PATCH 03/14] staging:iio:accel:adis16204 unwind use of IIO_CHAN macro.

[Lars-Peter Clausen <lars@metafoo.de>]

On 04/10/2012 10:21 PM, Jonathan Cameron wrote:
> This macro is being removed to simplify ongoing maintenance
> so we need to unwind and remaining users.
> 
> Note that previously the supply was not indexed. I have made
> it indexed for consistency with other similar devices and
> for internal consistency with the aux adc port.

Couldn't spot any real differences to the autogenerated cocci patch.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

> 
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> ---
>  drivers/staging/iio/accel/adis16204_core.c |   92 ++++++++++++++++++++--------
>  1 file changed, 67 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
> index fa89364..fdf31f1 100644
> --- a/drivers/staging/iio/accel/adis16204_core.c
> +++ b/drivers/staging/iio/accel/adis16204_core.c
> @@ -444,31 +444,73 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
>  }
>  
>  static struct iio_chan_spec adis16204_channels[] = {
> -	IIO_CHAN(IIO_VOLTAGE, 0, 0, 0, "supply", 0, 0,
> -		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
> -		 in_supply, ADIS16204_SCAN_SUPPLY,
> -		 IIO_ST('u', 12, 16, 0), 0),
> -	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
> -		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
> -		 in_aux, ADIS16204_SCAN_AUX_ADC,
> -		 IIO_ST('u', 12, 16, 0), 0),
> -	IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
> -		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> -		 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
> -		 temp, ADIS16204_SCAN_TEMP,
> -		 IIO_ST('u', 12, 16, 0), 0),
> -	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
> -		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> -		 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
> -		 IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
> -		 accel_x, ADIS16204_SCAN_ACC_X,
> -		 IIO_ST('s', 14, 16, 0), 0),
> -	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
> -		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> -		 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
> -		 IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
> -		 accel_y, ADIS16204_SCAN_ACC_Y,
> -		 IIO_ST('s', 14, 16, 0), 0),
> +	{
> +		.type = IIO_VOLTAGE,
> +		.indexed = 1, /* Note was not previously indexed */
> +		.channel = 0,
> +		.extend_name = "supply",
> +		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
> +		.address = in_supply,
> +		.scan_index = ADIS16204_SCAN_SUPPLY,
> +		.scan_type = {
> +			.sign = 'u',
> +			.realbits = 12,
> +			.storagebits = 16,
> +		},
> +	}, {
> +		.type = IIO_VOLTAGE,
> +		.indexed = 1,
> +		.channel = 1,
> +		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
> +		.address = in_aux,
> +		.scan_index = ADIS16204_SCAN_AUX_ADC,
> +		.scan_type = {
> +			.sign = 'u',
> +			.realbits = 12,
> +			.storagebits = 16,
> +		},
> +	}, {
> +		.type = IIO_TEMP,
> +		.indexed = 1,
> +		.channel = 0,
> +		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> +		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
> +		.address = temp,
> +		.scan_index = ADIS16204_SCAN_TEMP,
> +		.scan_type = {
> +			.sign = 'u',
> +			.realbits = 12,
> +			.storagebits = 16,
> +		},
> +	}, {
> +		.type = IIO_ACCEL,
> +		.modified = 1,
> +		.channel2 = IIO_MOD_X,
> +		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> +		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
> +		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
> +		.address = accel_x,
> +		.scan_index = ADIS16204_SCAN_ACC_X,
> +		.scan_type = {
> +			.sign = 's',
> +			.realbits = 14,
> +			.storagebits = 16,
> +		},
> +	}, {
> +		.type = IIO_ACCEL,
> +		.modified = 1,
> +		.channel2 = IIO_MOD_Y,
> +		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
> +		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
> +		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
> +		.address = accel_y,
> +		.scan_index = ADIS16204_SCAN_ACC_Y,
> +		.scan_type = {
> +			.sign = 's',
> +			.realbits = 14,
> +			.storagebits = 16,
> +		},
> +	},
>  	IIO_CHAN_SOFT_TIMESTAMP(5),
>  };
>