| Message ID | 20190731215250.16403-3-denis.ciocca@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | move buffer allocation into st_sensors_buffer | expand |
On Wed, 2019-07-31 at 14:52 -0700, Denis Ciocca wrote: > [External] > > Setup buffer_setup_ops pre/post enable/disable to use > st_sensor_buffers functions for memory allocation/de-allocation. > Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com> > Signed-off-by: Denis Ciocca <denis.ciocca@st.com> > --- > drivers/iio/accel/st_accel_buffer.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c > index 59dcef02ec19..fc1ba52152ab 100644 > --- a/drivers/iio/accel/st_accel_buffer.c > +++ b/drivers/iio/accel/st_accel_buffer.c > @@ -31,17 +31,11 @@ int st_accel_trig_set_state(struct iio_trigger *trig, bool state) > > static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > { > - struct st_sensor_data *adata = iio_priv(indio_dev); > int err; > > - adata->buffer_data = kmalloc(indio_dev->scan_bytes, > - GFP_DMA | GFP_KERNEL); > - if (!adata->buffer_data) > - return -ENOMEM; > - > err = iio_triggered_buffer_postenable(indio_dev); > if (err < 0) > - goto st_accel_free_buffer; > + return err; > > err = st_sensors_set_axis_enable(indio_dev, > (u8)indio_dev->active_scan_mask[0]); > @@ -58,14 +52,11 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS); > st_accel_buffer_predisable: > iio_triggered_buffer_predisable(indio_dev); > -st_accel_free_buffer: > - kfree(adata->buffer_data); > return err; > } > > static int st_accel_buffer_predisable(struct iio_dev *indio_dev) > { > - struct st_sensor_data *adata = iio_priv(indio_dev); > int err, err2; > > err = st_sensors_set_enable(indio_dev, false); > @@ -79,13 +70,14 @@ static int st_accel_buffer_predisable(struct iio_dev *indio_dev) > if (!err) > err = err2; > > - kfree(adata->buffer_data); > return err; > } > > static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = { > + .preenable = &st_sensors_buffer_preenable, > .postenable = &st_accel_buffer_postenable, > .predisable = &st_accel_buffer_predisable, > + .postdisable = &st_sensors_buffer_postdisable, > }; > > int st_accel_allocate_ring(struct iio_dev *indio_dev)
diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c index 59dcef02ec19..fc1ba52152ab 100644 --- a/drivers/iio/accel/st_accel_buffer.c +++ b/drivers/iio/accel/st_accel_buffer.c @@ -31,17 +31,11 @@ int st_accel_trig_set_state(struct iio_trigger *trig, bool state) static int st_accel_buffer_postenable(struct iio_dev *indio_dev) { - struct st_sensor_data *adata = iio_priv(indio_dev); int err; - adata->buffer_data = kmalloc(indio_dev->scan_bytes, - GFP_DMA | GFP_KERNEL); - if (!adata->buffer_data) - return -ENOMEM; - err = iio_triggered_buffer_postenable(indio_dev); if (err < 0) - goto st_accel_free_buffer; + return err; err = st_sensors_set_axis_enable(indio_dev, (u8)indio_dev->active_scan_mask[0]); @@ -58,14 +52,11 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS); st_accel_buffer_predisable: iio_triggered_buffer_predisable(indio_dev); -st_accel_free_buffer: - kfree(adata->buffer_data); return err; } static int st_accel_buffer_predisable(struct iio_dev *indio_dev) { - struct st_sensor_data *adata = iio_priv(indio_dev); int err, err2; err = st_sensors_set_enable(indio_dev, false); @@ -79,13 +70,14 @@ static int st_accel_buffer_predisable(struct iio_dev *indio_dev) if (!err) err = err2; - kfree(adata->buffer_data); return err; } static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = { + .preenable = &st_sensors_buffer_preenable, .postenable = &st_accel_buffer_postenable, .predisable = &st_accel_buffer_predisable, + .postdisable = &st_sensors_buffer_postdisable, }; int st_accel_allocate_ring(struct iio_dev *indio_dev)
Setup buffer_setup_ops pre/post enable/disable to use st_sensor_buffers functions for memory allocation/de-allocation. Signed-off-by: Denis Ciocca <denis.ciocca@st.com> --- drivers/iio/accel/st_accel_buffer.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)