Commit b9606e2a authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio:core drop info_mask from struct iio_info 



This has been replaced by the pair of masks info_mask_separate
and info_mask_shared_by_type.  Other variants may follow.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
parent 066f9051

drivers/iio/industrialio-core.c

+0 −17
Original line number Diff line number Diff line
@@ -691,23 +691,6 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, 


	if (chan->channel < 0)

		return 0;

	for_each_set_bit(i, &chan->info_mask, sizeof(long)*8) {

		ret = __iio_add_chan_devattr(iio_chan_info_postfix[i/2],

					     chan,

					     &iio_read_channel_info,

					     &iio_write_channel_info,

					     i/2,

					     !(i%2),

					     &indio_dev->dev,

					     &indio_dev->channel_attr_list);

		if (ret == -EBUSY && (i%2 == 0)) {

			ret = 0;

			continue;

		}

		if (ret < 0)

			goto error_ret;

		attrcount++;

	}

	for_each_set_bit(i, &chan->info_mask_separate, sizeof(long)*8) {

		ret = __iio_add_chan_devattr(iio_chan_info_postfix[i],

					     chan,

include/linux/iio/iio.h

+1 −72
Original line number Diff line number Diff line
@@ -38,76 +38,6 @@ enum iio_chan_info_enum { 
	IIO_CHAN_INFO_HYSTERESIS,

};



#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)

#define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)

#define IIO_CHAN_INFO_BITS(type) (IIO_CHAN_INFO_SHARED_BIT(type) | \

				    IIO_CHAN_INFO_SEPARATE_BIT(type))



#define IIO_CHAN_INFO_RAW_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)

#define IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PROCESSED)

#define IIO_CHAN_INFO_SCALE_SEPARATE_BIT		\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)

#define IIO_CHAN_INFO_SCALE_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SCALE)

#define IIO_CHAN_INFO_OFFSET_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_OFFSET)

#define IIO_CHAN_INFO_OFFSET_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_OFFSET)

#define IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBSCALE)

#define IIO_CHAN_INFO_CALIBSCALE_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBSCALE)

#define IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBBIAS)

#define IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBBIAS)

#define IIO_CHAN_INFO_PEAK_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAK)

#define IIO_CHAN_INFO_PEAK_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAK)

#define IIO_CHAN_INFO_PEAKSCALE_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAKSCALE)

#define IIO_CHAN_INFO_PEAKSCALE_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAKSCALE)

#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT	\

	IIO_CHAN_INFO_SEPARATE_BIT(				\

		IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)

#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED_BIT	\

	IIO_CHAN_INFO_SHARED_BIT(				\

		IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)

#define IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_AVERAGE_RAW)

#define IIO_CHAN_INFO_AVERAGE_RAW_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_AVERAGE_RAW)

#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT \

	IIO_CHAN_INFO_SHARED_BIT(			       \

		IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)

#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT \

	IIO_CHAN_INFO_SEPARATE_BIT(			       \

		IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)

#define IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT		\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ)

#define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ)

#define IIO_CHAN_INFO_FREQUENCY_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_FREQUENCY)

#define IIO_CHAN_INFO_FREQUENCY_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_FREQUENCY)

#define IIO_CHAN_INFO_PHASE_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE)

#define IIO_CHAN_INFO_PHASE_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE)

#define IIO_CHAN_INFO_HARDWAREGAIN_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN)

#define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN)

#define IIO_CHAN_INFO_HYSTERESIS_SEPARATE_BIT			\

	IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HYSTERESIS)

#define IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT			\

	IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HYSTERESIS)



enum iio_endian {

	IIO_CPU,

	IIO_BE,
@@ -281,8 +211,7 @@ struct iio_chan_spec { 
static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,

	enum iio_chan_info_enum type)

{

	return (chan->info_mask & IIO_CHAN_INFO_BITS(type)) |

	       (chan->info_mask_separate & type) |

	return (chan->info_mask_separate & type) |

	       (chan->info_mask_shared_by_type & type);

}