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

Commit f490f42b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:adc:ad7887 clear out last few uses of iio_dev->dev_data. 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 67688105

drivers/staging/iio/adc/ad7887_core.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int ad7887_read_raw(struct iio_dev *dev_info, 
			   long m)

{

	int ret;

	struct ad7887_state *st = dev_info->dev_data;

	struct ad7887_state *st = iio_priv(dev_info);

	unsigned int scale_uv;



	switch (m) {
@@ -118,7 +118,6 @@ static int __devinit ad7887_probe(struct spi_device *spi) 
	/* Estabilish that the iio_dev is a child of the spi device */

	indio_dev->dev.parent = &spi->dev;

	indio_dev->name = spi_get_device_id(spi)->name;

	indio_dev->dev_data = (void *)(st);

	indio_dev->info = &ad7887_info;

	indio_dev->modes = INDIO_DIRECT_MODE;

drivers/staging/iio/adc/ad7887_ring.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int ad7887_scan_from_ring(struct ad7887_state *st, long mask) 
 **/

static int ad7887_ring_preenable(struct iio_dev *indio_dev)

{

	struct ad7887_state *st = indio_dev->dev_data;

	struct ad7887_state *st = iio_priv(indio_dev);

	struct iio_ring_buffer *ring = indio_dev->ring;



	st->d_size = ring->scan_count *
@@ -100,7 +100,7 @@ static int ad7887_ring_preenable(struct iio_dev *indio_dev) 


static int ad7887_ring_postdisable(struct iio_dev *indio_dev)

{

	struct ad7887_state *st = indio_dev->dev_data;

	struct ad7887_state *st = iio_priv(indio_dev);



	/* dummy read: restore default CH0 settin */

	return spi_sync(st->spi, &st->msg[AD7887_CH0]);
@@ -116,7 +116,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p) 
{

	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->private_data;

	struct ad7887_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7887_state *st = iio_priv(indio_dev);

	struct iio_ring_buffer *ring = indio_dev->ring;

	s64 time_ns;

	__u8 *buf;