diff options
Diffstat (limited to 'drivers/iio/dac')
| -rw-r--r-- | drivers/iio/dac/ad5064.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5360.c | 10 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5380.c | 8 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5421.c | 10 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5446.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5449.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5504.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5624r_spi.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5686.c | 6 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5755.c | 10 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5764.c | 10 | ||||
| -rw-r--r-- | drivers/iio/dac/ad5791.c | 6 | ||||
| -rw-r--r-- | drivers/iio/dac/max517.c | 4 | ||||
| -rw-r--r-- | drivers/iio/dac/mcp4725.c | 4 | 
14 files changed, 44 insertions, 44 deletions
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c index 74f2d52795f..aa26d50ab63 100644 --- a/drivers/iio/dac/ad5064.c +++ b/drivers/iio/dac/ad5064.c @@ -296,8 +296,8 @@ static const struct iio_chan_spec_ext_info ad5064_ext_info[] = {  	.indexed = 1,						\  	.output = 1,						\  	.channel = (chan),					\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -	IIO_CHAN_INFO_SCALE_SEPARATE_BIT,			\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +	BIT(IIO_CHAN_INFO_SCALE),					\  	.address = addr,					\  	.scan_type = IIO_ST('u', (bits), 16, 20 - (bits)),	\  	.ext_info = ad5064_ext_info,				\ diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c index 92771217f66..80923af424f 100644 --- a/drivers/iio/dac/ad5360.c +++ b/drivers/iio/dac/ad5360.c @@ -102,11 +102,11 @@ enum ad5360_type {  	.type = IIO_VOLTAGE,					\  	.indexed = 1,						\  	.output = 1,						\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |	\ -		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,	\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +		BIT(IIO_CHAN_INFO_SCALE) |				\ +		BIT(IIO_CHAN_INFO_OFFSET) |				\ +		BIT(IIO_CHAN_INFO_CALIBSCALE) |			\ +		BIT(IIO_CHAN_INFO_CALIBBIAS),			\  	.scan_type = IIO_ST('u', (bits), 16, 16 - (bits))	\  } diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c index 483fc379a2d..bf2db02215c 100644 --- a/drivers/iio/dac/ad5380.c +++ b/drivers/iio/dac/ad5380.c @@ -257,10 +257,10 @@ static struct iio_chan_spec_ext_info ad5380_ext_info[] = {  	.type = IIO_VOLTAGE,					\  	.indexed = 1,						\  	.output = 1,						\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_SCALE_SHARED_BIT |		\ -		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,		\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +		BIT(IIO_CHAN_INFO_CALIBSCALE) |			\ +		BIT(IIO_CHAN_INFO_CALIBBIAS),			\ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\  	.scan_type = IIO_ST('u', (_bits), 16, 14 - (_bits)),	\  	.ext_info = ad5380_ext_info,				\  } diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c index 6b86a638dad..98f24407c3c 100644 --- a/drivers/iio/dac/ad5421.c +++ b/drivers/iio/dac/ad5421.c @@ -86,11 +86,11 @@ static const struct iio_chan_spec ad5421_channels[] = {  		.indexed = 1,  		.output = 1,  		.channel = 0, -		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | -			IIO_CHAN_INFO_SCALE_SHARED_BIT | -			IIO_CHAN_INFO_OFFSET_SHARED_BIT | -			IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | -			IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, +		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | +			BIT(IIO_CHAN_INFO_CALIBSCALE) | +			BIT(IIO_CHAN_INFO_CALIBBIAS), +		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | +			BIT(IIO_CHAN_INFO_OFFSET),  		.scan_type = IIO_ST('u', 16, 16, 0),  		.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |  			IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c index f5583aedfb5..cae8f6056ac 100644 --- a/drivers/iio/dac/ad5446.c +++ b/drivers/iio/dac/ad5446.c @@ -143,8 +143,8 @@ static const struct iio_chan_spec_ext_info ad5446_ext_info_powerdown[] = {  	.indexed = 1, \  	.output = 1, \  	.channel = 0, \ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ -	IIO_CHAN_INFO_SCALE_SHARED_BIT,	\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \  	.scan_type = IIO_ST('u', (bits), (storage), (shift)), \  	.ext_info = (ext), \  } diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c index c4731b7b577..ba1c914b039 100644 --- a/drivers/iio/dac/ad5449.c +++ b/drivers/iio/dac/ad5449.c @@ -206,8 +206,8 @@ static const struct iio_info ad5449_info = {  	.indexed = 1,						\  	.output = 1,						\  	.channel = (chan),					\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_SCALE_SEPARATE_BIT,		\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +		BIT(IIO_CHAN_INFO_SCALE),			\  	.address = (chan),					\  	.scan_type = IIO_ST('u', (bits), 16, 12 - (bits)),	\  } diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index e5e59749f10..139206e84cb 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c @@ -259,8 +259,8 @@ static const struct iio_chan_spec_ext_info ad5504_ext_info[] = {  	.indexed = 1, \  	.output = 1, \  	.channel = (_chan), \ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ -		     IIO_CHAN_INFO_SCALE_SHARED_BIT, \ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \  	.address = AD5504_ADDR_DAC(_chan), \  	.scan_type = IIO_ST('u', 12, 16, 0), \  	.ext_info = ad5504_ext_info, \ diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c index f6e116627b7..bb298aaff32 100644 --- a/drivers/iio/dac/ad5624r_spi.c +++ b/drivers/iio/dac/ad5624r_spi.c @@ -174,8 +174,8 @@ static const struct iio_chan_spec_ext_info ad5624r_ext_info[] = {  	.indexed = 1, \  	.output = 1, \  	.channel = (_chan), \ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ -		     IIO_CHAN_INFO_SCALE_SHARED_BIT, \ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \  	.address = (_chan), \  	.scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \  	.ext_info = ad5624r_ext_info, \ diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index 5e554af2170..06439b1af9b 100644 --- a/drivers/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c @@ -276,9 +276,9 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {  		.indexed = 1,					\  		.output = 1,					\  		.channel = chan,				\ -		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |	\ -		IIO_CHAN_INFO_SCALE_SHARED_BIT,			\ -		.address = AD5686_ADDR_DAC(chan),			\ +		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\ +		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ +		.address = AD5686_ADDR_DAC(chan),		\  		.scan_type = IIO_ST('u', bits, 16, shift),	\  		.ext_info = ad5686_ext_info,			\  } diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c index 71faabc6b14..12bb315e55f 100644 --- a/drivers/iio/dac/ad5755.c +++ b/drivers/iio/dac/ad5755.c @@ -393,11 +393,11 @@ static const struct iio_chan_spec_ext_info ad5755_ext_info[] = {  #define AD5755_CHANNEL(_bits) {					\  	.indexed = 1,						\  	.output = 1,						\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,		\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +		BIT(IIO_CHAN_INFO_SCALE) |			\ +		BIT(IIO_CHAN_INFO_OFFSET) |			\ +		BIT(IIO_CHAN_INFO_CALIBSCALE) |			\ +		BIT(IIO_CHAN_INFO_CALIBBIAS),			\  	.scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)),	\  	.ext_info = ad5755_ext_info,				\  } diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c index 5b7acd3a2c7..7a53f7d70da 100644 --- a/drivers/iio/dac/ad5764.c +++ b/drivers/iio/dac/ad5764.c @@ -78,11 +78,11 @@ enum ad5764_type {  	.output = 1,						\  	.channel = (_chan),					\  	.address = (_chan),					\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_OFFSET_SHARED_BIT |		\ -		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |		\ -		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,		\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\ +		BIT(IIO_CHAN_INFO_SCALE) |			\ +		BIT(IIO_CHAN_INFO_CALIBSCALE) |			\ +		BIT(IIO_CHAN_INFO_CALIBBIAS),			\ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET),	\  	.scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits))	\  } diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c index 8dfd3da8a07..97c1e5d780d 100644 --- a/drivers/iio/dac/ad5791.c +++ b/drivers/iio/dac/ad5791.c @@ -302,9 +302,9 @@ static const struct iio_chan_spec_ext_info ad5791_ext_info[] = {  	.indexed = 1,					\  	.address = AD5791_ADDR_DAC0,			\  	.channel = 0,					\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |	\ -		IIO_CHAN_INFO_SCALE_SHARED_BIT |	\ -		IIO_CHAN_INFO_OFFSET_SHARED_BIT,	\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\ +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |	\ +		BIT(IIO_CHAN_INFO_OFFSET),		\  	.scan_type = IIO_ST('u', bits, 24, shift),	\  	.ext_info = ad5791_ext_info,			\  } diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c index 352abe2004a..ebfaa415624 100644 --- a/drivers/iio/dac/max517.c +++ b/drivers/iio/dac/max517.c @@ -146,8 +146,8 @@ static const struct iio_info max517_info = {  	.indexed = 1,					\  	.output = 1,					\  	.channel = (chan),				\ -	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |	\ -	IIO_CHAN_INFO_SCALE_SEPARATE_BIT,		\ +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |	\ +	BIT(IIO_CHAN_INFO_SCALE),			\  	.scan_type = IIO_ST('u', 8, 8, 0),		\  } diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c index 8f88cc4059a..a612ec766d9 100644 --- a/drivers/iio/dac/mcp4725.c +++ b/drivers/iio/dac/mcp4725.c @@ -69,8 +69,8 @@ static const struct iio_chan_spec mcp4725_channel = {  	.indexed	= 1,  	.output		= 1,  	.channel	= 0, -	.info_mask	= IIO_CHAN_INFO_RAW_SEPARATE_BIT | -			  IIO_CHAN_INFO_SCALE_SHARED_BIT, +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), +	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),  	.scan_type	= IIO_ST('u', 12, 16, 0),  };  |