Commit c1633187 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:adc:ad799x use iio_sw_buffer_preenable to avoid code repitiion

Using this generic function cuts down on repeated code at the cost of
a little overhead in a slow path.
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a64c0634
...@@ -104,7 +104,6 @@ struct ad799x_chip_info { ...@@ -104,7 +104,6 @@ struct ad799x_chip_info {
struct ad799x_state { struct ad799x_state {
struct i2c_client *client; struct i2c_client *client;
const struct ad799x_chip_info *chip_info; const struct ad799x_chip_info *chip_info;
size_t d_size;
struct iio_trigger *trig; struct iio_trigger *trig;
struct regulator *reg; struct regulator *reg;
u16 int_vref_mv; u16 int_vref_mv;
......
...@@ -32,9 +32,7 @@ ...@@ -32,9 +32,7 @@
**/ **/
static int ad799x_ring_preenable(struct iio_dev *indio_dev) static int ad799x_ring_preenable(struct iio_dev *indio_dev)
{ {
struct iio_buffer *ring = indio_dev->buffer;
struct ad799x_state *st = iio_priv(indio_dev); struct ad799x_state *st = iio_priv(indio_dev);
/* /*
* Need to figure out the current mode based upon the requested * Need to figure out the current mode based upon the requested
* scan mask in iio_dev * scan mask in iio_dev
...@@ -43,21 +41,7 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev) ...@@ -43,21 +41,7 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev)
if (st->id == ad7997 || st->id == ad7998) if (st->id == ad7997 || st->id == ad7998)
ad7997_8_set_scan_mode(st, *indio_dev->active_scan_mask); ad7997_8_set_scan_mode(st, *indio_dev->active_scan_mask);
st->d_size = bitmap_weight(indio_dev->active_scan_mask, return iio_sw_buffer_preenable(indio_dev);
indio_dev->masklength) * 2;
if (ring->scan_timestamp) {
st->d_size += sizeof(s64);
if (st->d_size % sizeof(s64))
st->d_size += sizeof(s64) - (st->d_size % sizeof(s64));
}
if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->buffer->access->
set_bytes_per_datum(indio_dev->buffer, st->d_size);
return 0;
} }
/** /**
...@@ -78,7 +62,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) ...@@ -78,7 +62,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
int b_sent; int b_sent;
u8 cmd; u8 cmd;
rxbuf = kmalloc(st->d_size, GFP_KERNEL); rxbuf = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
if (rxbuf == NULL) if (rxbuf == NULL)
goto out; goto out;
...@@ -112,7 +96,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) ...@@ -112,7 +96,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
time_ns = iio_get_time_ns(); time_ns = iio_get_time_ns();
if (ring->scan_timestamp) if (ring->scan_timestamp)
memcpy(rxbuf + st->d_size - sizeof(s64), memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
&time_ns, sizeof(time_ns)); &time_ns, sizeof(time_ns));
ring->access->store_to(indio_dev->buffer, rxbuf, time_ns); ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment