| Message ID | 20200321090802.11537-4-alexandru.ardelean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/5] iio: adc: ad7780: define/use own IIO channel macros | expand |
On Sat, 21 Mar 2020 11:08:01 +0200 Alexandru Ardelean <alexandru.ardelean@analog.com> wrote: > Now that all channel SigmaDelta IIO channel macros have been localized, > remove the generic ones. > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Applied. Thanks, Jonathan > --- > include/linux/iio/adc/ad_sigma_delta.h | 58 -------------------------- > 1 file changed, 58 deletions(-) > > diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h > index 5a127c0ed200..a3a838dcf8e4 100644 > --- a/include/linux/iio/adc/ad_sigma_delta.h > +++ b/include/linux/iio/adc/ad_sigma_delta.h > @@ -133,62 +133,4 @@ void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev); > > int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig); > > -#define __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ > - _storagebits, _shift, _extend_name, _type, _mask_all) \ > - { \ > - .type = (_type), \ > - .differential = (_channel2 == -1 ? 0 : 1), \ > - .indexed = 1, \ > - .channel = (_channel1), \ > - .channel2 = (_channel2), \ > - .address = (_address), \ > - .extend_name = (_extend_name), \ > - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ > - BIT(IIO_CHAN_INFO_OFFSET), \ > - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ > - .info_mask_shared_by_all = _mask_all, \ > - .scan_index = (_si), \ > - .scan_type = { \ > - .sign = 'u', \ > - .realbits = (_bits), \ > - .storagebits = (_storagebits), \ > - .shift = (_shift), \ > - .endianness = IIO_BE, \ > - }, \ > - } > - > -#define AD_SD_DIFF_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ > - _storagebits, _shift) \ > - __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ > - _storagebits, _shift, NULL, IIO_VOLTAGE, \ > - BIT(IIO_CHAN_INFO_SAMP_FREQ)) > - > -#define AD_SD_SHORTED_CHANNEL(_si, _channel, _address, _bits, \ > - _storagebits, _shift) \ > - __AD_SD_CHANNEL(_si, _channel, _channel, _address, _bits, \ > - _storagebits, _shift, "shorted", IIO_VOLTAGE, \ > - BIT(IIO_CHAN_INFO_SAMP_FREQ)) > - > -#define AD_SD_CHANNEL(_si, _channel, _address, _bits, \ > - _storagebits, _shift) \ > - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ > - _storagebits, _shift, NULL, IIO_VOLTAGE, \ > - BIT(IIO_CHAN_INFO_SAMP_FREQ)) > - > -#define AD_SD_CHANNEL_NO_SAMP_FREQ(_si, _channel, _address, _bits, \ > - _storagebits, _shift) \ > - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ > - _storagebits, _shift, NULL, IIO_VOLTAGE, 0) > - > -#define AD_SD_TEMP_CHANNEL(_si, _address, _bits, _storagebits, _shift) \ > - __AD_SD_CHANNEL(_si, 0, -1, _address, _bits, \ > - _storagebits, _shift, NULL, IIO_TEMP, \ > - BIT(IIO_CHAN_INFO_SAMP_FREQ)) > - > -#define AD_SD_SUPPLY_CHANNEL(_si, _channel, _address, _bits, _storagebits, \ > - _shift) \ > - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ > - _storagebits, _shift, "supply", IIO_VOLTAGE, \ > - BIT(IIO_CHAN_INFO_SAMP_FREQ)) > - > #endif
diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h index 5a127c0ed200..a3a838dcf8e4 100644 --- a/include/linux/iio/adc/ad_sigma_delta.h +++ b/include/linux/iio/adc/ad_sigma_delta.h @@ -133,62 +133,4 @@ void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev); int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig); -#define __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ - _storagebits, _shift, _extend_name, _type, _mask_all) \ - { \ - .type = (_type), \ - .differential = (_channel2 == -1 ? 0 : 1), \ - .indexed = 1, \ - .channel = (_channel1), \ - .channel2 = (_channel2), \ - .address = (_address), \ - .extend_name = (_extend_name), \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ - BIT(IIO_CHAN_INFO_OFFSET), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ - .info_mask_shared_by_all = _mask_all, \ - .scan_index = (_si), \ - .scan_type = { \ - .sign = 'u', \ - .realbits = (_bits), \ - .storagebits = (_storagebits), \ - .shift = (_shift), \ - .endianness = IIO_BE, \ - }, \ - } - -#define AD_SD_DIFF_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ - _storagebits, _shift) \ - __AD_SD_CHANNEL(_si, _channel1, _channel2, _address, _bits, \ - _storagebits, _shift, NULL, IIO_VOLTAGE, \ - BIT(IIO_CHAN_INFO_SAMP_FREQ)) - -#define AD_SD_SHORTED_CHANNEL(_si, _channel, _address, _bits, \ - _storagebits, _shift) \ - __AD_SD_CHANNEL(_si, _channel, _channel, _address, _bits, \ - _storagebits, _shift, "shorted", IIO_VOLTAGE, \ - BIT(IIO_CHAN_INFO_SAMP_FREQ)) - -#define AD_SD_CHANNEL(_si, _channel, _address, _bits, \ - _storagebits, _shift) \ - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ - _storagebits, _shift, NULL, IIO_VOLTAGE, \ - BIT(IIO_CHAN_INFO_SAMP_FREQ)) - -#define AD_SD_CHANNEL_NO_SAMP_FREQ(_si, _channel, _address, _bits, \ - _storagebits, _shift) \ - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ - _storagebits, _shift, NULL, IIO_VOLTAGE, 0) - -#define AD_SD_TEMP_CHANNEL(_si, _address, _bits, _storagebits, _shift) \ - __AD_SD_CHANNEL(_si, 0, -1, _address, _bits, \ - _storagebits, _shift, NULL, IIO_TEMP, \ - BIT(IIO_CHAN_INFO_SAMP_FREQ)) - -#define AD_SD_SUPPLY_CHANNEL(_si, _channel, _address, _bits, _storagebits, \ - _shift) \ - __AD_SD_CHANNEL(_si, _channel, -1, _address, _bits, \ - _storagebits, _shift, "supply", IIO_VOLTAGE, \ - BIT(IIO_CHAN_INFO_SAMP_FREQ)) - #endif
Now that all channel SigmaDelta IIO channel macros have been localized, remove the generic ones. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> --- include/linux/iio/adc/ad_sigma_delta.h | 58 -------------------------- 1 file changed, 58 deletions(-)