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

staging:iio: Remove used iio_work_cont definition and all references 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44b759b7

drivers/staging/iio/accel/adis16209.h

+0 −3
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ 
 * struct adis16209_state - device instance specific data

 * @us:			actual spi_device

 * @work_trigger_to_ring: bh for triggered event handling

 * @work_cont_thresh: CLEAN

 * @inter:		used to check if new interrupt has been triggered

 * @last_timestamp:	passing timestamp from th to bh of interrupt handler

 * @indio_dev:		industrial I/O device structure

 * @trig:		data ready trigger registered with iio
@@ -117,7 +115,6 @@ 
struct adis16209_state {

	struct spi_device		*us;

	struct work_struct		work_trigger_to_ring;

	struct iio_work_cont		work_cont_thresh;

	s64				last_timestamp;

	struct iio_dev			*indio_dev;

	struct iio_trigger		*trig;

drivers/staging/iio/accel/adis16220.h

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ 
 * struct adis16220_state - device instance specific data

 * @us:			actual spi_device

 * @work_trigger_to_ring: bh for triggered event handling

 * @work_cont_thresh: CLEAN

 * @inter:		used to check if new interrupt has been triggered

 * @last_timestamp:	passing timestamp from th to bh of interrupt handler

 * @indio_dev:		industrial I/O device structure

drivers/staging/iio/accel/adis16240.h

+0 −2
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ 
 * struct adis16240_state - device instance specific data

 * @us:			actual spi_device

 * @work_trigger_to_ring: bh for triggered event handling

 * @work_cont_thresh: CLEAN

 * @inter:		used to check if new interrupt has been triggered

 * @last_timestamp:	passing timestamp from th to bh of interrupt handler

 * @indio_dev:		industrial I/O device structure
@@ -139,7 +138,6 @@ 
struct adis16240_state {

	struct spi_device		*us;

	struct work_struct		work_trigger_to_ring;

	struct iio_work_cont		work_cont_thresh;

	s64				last_timestamp;

	struct iio_dev			*indio_dev;

	struct iio_trigger		*trig;

drivers/staging/iio/gyro/adis16260.h

+0 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
 * struct adis16260_state - device instance specific data

 * @us:			actual spi_device

 * @work_trigger_to_ring: bh for triggered event handling

 * @work_cont_thresh: CLEAN

 * @inter:		used to check if new interrupt has been triggered

 * @last_timestamp:	passing timestamp from th to bh of interrupt handler

 * @indio_dev:		industrial I/O device structure
@@ -97,7 +96,6 @@ 
struct adis16260_state {

	struct spi_device		*us;

	struct work_struct		work_trigger_to_ring;

	struct iio_work_cont		work_cont_thresh;

	s64				last_timestamp;

	struct iio_dev			*indio_dev;

	struct iio_trigger		*trig;

drivers/staging/iio/iio.h

+0 −43
Original line number Diff line number Diff line
@@ -283,49 +283,6 @@ int iio_push_event(struct iio_dev *dev_info, 
		  int ev_code,

		  s64 timestamp);



/**

 * struct iio_work_cont - container for when singleton handler case matters

 * @ws:			[DEVICE] work_struct when not only possible event

 * @ws_nocheck:		[DEVICE] work_struct when only possible event

 * @address:		[DEVICE] associated register address

 * @mask:		[DEVICE] associated mask for identifying event source

 * @st:			[DEVICE] device specific state information

 **/

struct iio_work_cont {

	struct work_struct	ws;

	struct work_struct	ws_nocheck;

	int			address;

	int			mask;

	void			*st;

};



#define to_iio_work_cont_check(_ws)			\

	container_of(_ws, struct iio_work_cont, ws)



#define to_iio_work_cont_no_check(_ws)				\

	container_of(_ws, struct iio_work_cont, ws_nocheck)



/**

 * iio_init_work_cont() - intiialize the elements of a work container

 * @cont: the work container

 * @_checkfunc: function called when there are multiple possible int sources

 * @_nocheckfunc: function for when there is only one int source

 * @_add: driver dependent, typically a register address

 * @_mask: driver dependent, typically a bit mask for a register

 * @_st: driver dependent, typically pointer to a device state structure

 **/

static inline void

iio_init_work_cont(struct iio_work_cont *cont,

		   void (*_checkfunc)(struct work_struct *),

		   void (*_nocheckfunc)(struct work_struct *),

		   int _add, int _mask, void *_st)

{

	INIT_WORK(&(cont)->ws, _checkfunc);

	INIT_WORK(&(cont)->ws_nocheck, _nocheckfunc);

	cont->address = _add;

	cont->mask = _mask;

	cont->st = _st;

}

/**

 * __iio_push_event() - tries to add an event to the list associated with a chrdev

 * @ev_int:		the event interface to which we are pushing the event