staging:iio: Rip out helper for software rings.

It seemed like a good idea at the time, it wasn't.
The code with this in place is larger and more complex for
no real gain.  Basically we've cleaned up the core around
it so much that this no longer makes sense.

Only really effects the lis3l02dq driver.

Signed-off-by: Jonathan Cameron <jic23@cam.acuk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h
index 43277d1dd9a..94d98695995 100644
--- a/drivers/staging/iio/accel/lis3l02dq.h
+++ b/drivers/staging/iio/accel/lis3l02dq.h
@@ -148,7 +148,6 @@ Form of high byte dependent 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
  * @trig:               data ready trigger registered with iio
  * @tx:                 transmit buffer
@@ -156,17 +155,14 @@ Form of high byte dependent on justification set in ctrl reg */
  * @buf_lock:           mutex to protect tx and rx
  **/
 struct lis3l02dq_state {
-        struct iio_sw_ring_helper_state help;
         struct spi_device               *us;
         struct iio_trigger              *trig;
-        u8                              *tx;
-        u8                              *rx;
         struct mutex                    buf_lock;
         bool                            trigger_on;
-};
 
-#define lis3l02dq_h_to_s(_h)                            \
-        container_of(_h, struct lis3l02dq_state, help)
+        u8      tx[LIS3L02DQ_MAX_RX] ____cacheline_aligned;
+        u8      rx[LIS3L02DQ_MAX_RX] ____cacheline_aligned;
+};
 
 int lis3l02dq_spi_read_reg_8(struct iio_dev *indio_dev,
                              u8 reg_address,