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

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

staging: iio: Add iio_triggered_ring postenable and predisable + use in drivers 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarBarry Song <21cnbao@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 15744090

drivers/staging/iio/accel/adis16209_ring.c

+2 −18
Original line number Diff line number Diff line
@@ -186,22 +186,6 @@ static int adis16209_data_rdy_ring_preenable(struct iio_dev *indio_dev) 
	return 0;

}



static int adis16209_data_rdy_ring_postenable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_attach_poll_func(indio_dev->trig,

					       indio_dev->pollfunc)

		: 0;

}



static int adis16209_data_rdy_ring_predisable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_dettach_poll_func(indio_dev->trig,

						indio_dev->pollfunc)

		: 0;

}



void adis16209_unconfigure_ring(struct iio_dev *indio_dev)

{

	kfree(indio_dev->pollfunc);
@@ -237,8 +221,8 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) 
	/* Effectively select the ring buffer implementation */

	iio_ring_sw_register_funcs(&ring->access);

	ring->preenable = &adis16209_data_rdy_ring_preenable;

	ring->postenable = &adis16209_data_rdy_ring_postenable;

	ring->predisable = &adis16209_data_rdy_ring_predisable;

	ring->postenable = &iio_triggered_ring_postenable;

	ring->predisable = &iio_triggered_ring_predisable;

	ring->owner = THIS_MODULE;



	ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16209_poll_func_th);

drivers/staging/iio/accel/adis16240_ring.c

+2 −18
Original line number Diff line number Diff line
@@ -176,22 +176,6 @@ static int adis16240_data_rdy_ring_preenable(struct iio_dev *indio_dev) 
	return 0;

}



static int adis16240_data_rdy_ring_postenable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_attach_poll_func(indio_dev->trig,

				indio_dev->pollfunc)

		: 0;

}



static int adis16240_data_rdy_ring_predisable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_dettach_poll_func(indio_dev->trig,

				indio_dev->pollfunc)

		: 0;

}



void adis16240_unconfigure_ring(struct iio_dev *indio_dev)

{

	kfree(indio_dev->pollfunc);
@@ -225,8 +209,8 @@ int adis16240_configure_ring(struct iio_dev *indio_dev) 
	/* Effectively select the ring buffer implementation */

	iio_ring_sw_register_funcs(&ring->access);

	ring->preenable = &adis16240_data_rdy_ring_preenable;

	ring->postenable = &adis16240_data_rdy_ring_postenable;

	ring->predisable = &adis16240_data_rdy_ring_predisable;

	ring->postenable = &iio_triggered_ring_postenable;

	ring->predisable = &iio_triggered_ring_predisable;

	ring->owner = THIS_MODULE;



	ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16240_poll_func_th);

drivers/staging/iio/accel/lis3l02dq_ring.c

+2 −19
Original line number Diff line number Diff line
@@ -339,23 +339,6 @@ static int lis3l02dq_data_rdy_ring_preenable(struct iio_dev *indio_dev) 
	return 0;

}



static int lis3l02dq_data_rdy_ring_postenable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_attach_poll_func(indio_dev->trig,

					       indio_dev->pollfunc)

		: 0;

}



static int lis3l02dq_data_rdy_ring_predisable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_dettach_poll_func(indio_dev->trig,

						indio_dev->pollfunc)

		: 0;

}





/* Caller responsible for locking as necessary. */

static int

__lis3l02dq_write_data_ready_config(struct device *dev,
@@ -562,8 +545,8 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) 
	/* Effectively select the ring buffer implementation */

	iio_ring_sw_register_funcs(&ring->access);

	ring->preenable = &lis3l02dq_data_rdy_ring_preenable;

	ring->postenable = &lis3l02dq_data_rdy_ring_postenable;

	ring->predisable = &lis3l02dq_data_rdy_ring_predisable;

	ring->postenable = &iio_triggered_ring_postenable;

	ring->predisable = &iio_triggered_ring_predisable;

	ring->owner = THIS_MODULE;



	ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th);

drivers/staging/iio/adc/max1363_ring.c

+2 −31
Original line number Diff line number Diff line
@@ -105,35 +105,6 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev) 
	return 0;

}



/**

 * max1363_ring_postenable() - typical ring post enable

 *

 * Only not moved into the core for the hardware ring buffer cases

 * that are more sophisticated.

 **/

static int max1363_ring_postenable(struct iio_dev *indio_dev)

{

	if (indio_dev->trig == NULL)

		return 0;

	return iio_trigger_attach_poll_func(indio_dev->trig,

					    indio_dev->pollfunc);

}



/**

 * max1363_ring_predisable() - runs just prior to ring buffer being disabled

 *

 * Typical predisable function which ensures that no trigger events can

 * occur before we disable the ring buffer (and hence would have no idea

 * what to do with them)

 **/

static int max1363_ring_predisable(struct iio_dev *indio_dev)

{

	if (indio_dev->trig)

		return iio_trigger_dettach_poll_func(indio_dev->trig,

						     indio_dev->pollfunc);

	else

		return 0;

}



/**

 * max1363_poll_func_th() - th of trigger launched polling to ring buffer
@@ -228,9 +199,9 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) 
		goto error_deallocate_sw_rb;



	/* Ring buffer functions - here trigger setup related */

	indio_dev->ring->postenable = &max1363_ring_postenable;

	indio_dev->ring->postenable = &iio_triggered_ring_postenable;

	indio_dev->ring->preenable = &max1363_ring_preenable;

	indio_dev->ring->predisable = &max1363_ring_predisable;

	indio_dev->ring->predisable = &iio_triggered_ring_predisable;

	INIT_WORK(&st->poll_work, &max1363_poll_bh_to_ring);



	/* Flag that polled ring buffering is possible */

drivers/staging/iio/gyro/adis16260_ring.c

+2 −18
Original line number Diff line number Diff line
@@ -179,22 +179,6 @@ static int adis16260_data_rdy_ring_preenable(struct iio_dev *indio_dev) 
	return 0;

}



static int adis16260_data_rdy_ring_postenable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_attach_poll_func(indio_dev->trig,

				indio_dev->pollfunc)

		: 0;

}



static int adis16260_data_rdy_ring_predisable(struct iio_dev *indio_dev)

{

	return indio_dev->trig

		? iio_trigger_dettach_poll_func(indio_dev->trig,

				indio_dev->pollfunc)

		: 0;

}



void adis16260_unconfigure_ring(struct iio_dev *indio_dev)

{

	kfree(indio_dev->pollfunc);
@@ -227,8 +211,8 @@ int adis16260_configure_ring(struct iio_dev *indio_dev) 
	/* Effectively select the ring buffer implementation */

	iio_ring_sw_register_funcs(&ring->access);

	ring->preenable = &adis16260_data_rdy_ring_preenable;

	ring->postenable = &adis16260_data_rdy_ring_postenable;

	ring->predisable = &adis16260_data_rdy_ring_predisable;

	ring->postenable = &iio_triggered_ring_postenable;

	ring->predisable = &iio_triggered_ring_predisable;

	ring->owner = THIS_MODULE;



	ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16260_poll_func_th);