diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 16:39:19 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:38:29 -0700 |
commit | 73bce12e445edc228fbfc84d66693601c5744837 (patch) | |
tree | 7b1b1413da2c26cabad5a8c5884eec56991d2bbe /drivers/staging/iio/accel/lis3l02dq.h | |
parent | 59883ba170bc280787ad9d5decd7677cf6c38ef8 (diff) |
staging: iio: lis3l02dq: use iio_sw_ring_helper_state and funcs
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/lis3l02dq.h')
-rw-r--r-- | drivers/staging/iio/accel/lis3l02dq.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h index 6de172ebc042..44669ee10671 100644 --- a/drivers/staging/iio/accel/lis3l02dq.h +++ b/drivers/staging/iio/accel/lis3l02dq.h @@ -148,30 +148,29 @@ Form of high byte dependant on justification set in ctrl reg */ #define LIS3L02DQ_MAX_RX 12 /** * struct lis3l02dq_state - device instance specific data + * @helper: data and func pointer allowing generic functions * @us: actual spi_device - * @work_trigger_to_ring: bh for triggered event handling * @work_thresh: bh for threshold events * @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 * @tx: transmit buffer * @rx: recieve buffer * @buf_lock: mutex to protect tx and rx **/ struct lis3l02dq_state { + struct iio_sw_ring_helper_state help; struct spi_device *us; - struct work_struct work_trigger_to_ring; struct work_struct work_thresh; bool inter; - s64 last_timestamp; - struct iio_dev *indio_dev; struct iio_trigger *trig; u8 *tx; u8 *rx; struct mutex buf_lock; }; +#define lis3l02dq_h_to_s(_h) \ + container_of(_h, struct lis3l02dq_state, help) + int lis3l02dq_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val); |