Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee0312a0 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio:ade7758: Use iio_validate_scan_mask_onehot 



Only one of the channels of the ade7758 may be sampled at a time. Use the new
validate_scan_mask callback and the iio_validate_scan_mask_onehot function to
implement this restriction. Previously this was implemented using
available_scan_masks, but this requires a individual scan mask for each channel.

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

drivers/staging/iio/meter/ade7758.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct ade7758_state { 
	u8			*tx;

	u8			*rx;

	struct mutex		buf_lock;

	unsigned long		available_scan_masks[AD7758_NUM_WAVESRC];

	struct iio_chan_spec	*ade7758_ring_channels;

	struct spi_transfer	ring_xfer[4];

	struct spi_message	ring_msg;

drivers/staging/iio/meter/ade7758_core.c

+1 −6
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static const struct iio_info ade7758_info = { 


static int __devinit ade7758_probe(struct spi_device *spi)

{

	int i, ret;

	int ret;

	struct ade7758_state *st;

	struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
@@ -916,11 +916,6 @@ static int __devinit ade7758_probe(struct spi_device *spi) 
	indio_dev->info = &ade7758_info;

	indio_dev->modes = INDIO_DIRECT_MODE;



	for (i = 0; i < AD7758_NUM_WAVESRC; i++)

		set_bit(i, &st->available_scan_masks[i]);



	indio_dev->available_scan_masks = st->available_scan_masks;



	ret = ade7758_configure_ring(indio_dev);

	if (ret)

		goto error_free_tx;

drivers/staging/iio/meter/ade7758_ring.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static const struct iio_buffer_setup_ops ade7758_ring_setup_ops = { 
	.preenable = &ade7758_ring_preenable,

	.postenable = &iio_triggered_buffer_postenable,

	.predisable = &iio_triggered_buffer_predisable,

	.validate_scan_mask = &iio_validate_scan_mask_onehot,

};



void ade7758_unconfigure_ring(struct iio_dev *indio_dev)