| Message ID | 20190730000305.30958-4-denis.ciocca@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | preenable/postenable/predisable fixup for ST drivers | expand |
On Mon, 2019-07-29 at 17:03 -0700, Denis Ciocca wrote: > [External] > > This patch is trying to cleanup for good the buffers operation functions. > Let's rename the goto label using operation to perform and not > where it fails. 1 minor comment inline Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com> > > Signed-off-by: Denis Ciocca <denis.ciocca@st.com> > --- > drivers/iio/magnetometer/st_magn_buffer.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c > index 9dba93539a99..8d06643a042d 100644 > --- a/drivers/iio/magnetometer/st_magn_buffer.c > +++ b/drivers/iio/magnetometer/st_magn_buffer.c > @@ -31,40 +31,36 @@ int st_magn_trig_set_state(struct iio_trigger *trig, bool state) > > static int st_magn_buffer_postenable(struct iio_dev *indio_dev) > { > - int err; > struct st_sensor_data *mdata = iio_priv(indio_dev); > + int err; This looks more like style-change; but not a problem. > > mdata->buffer_data = kmalloc(indio_dev->scan_bytes, > GFP_DMA | GFP_KERNEL); > - if (mdata->buffer_data == NULL) { > - err = -ENOMEM; > - goto allocate_memory_error; > - } > + if (!mdata->buffer_data) > + return -ENOMEM; > > err = iio_triggered_buffer_postenable(indio_dev); > if (err < 0) > - goto st_magn_buffer_postenable_error; > + goto st_magn_free_buffer; > > return st_sensors_set_enable(indio_dev, true); > > -st_magn_buffer_postenable_error: > +st_magn_free_buffer: > kfree(mdata->buffer_data); > -allocate_memory_error: > return err; > } > > static int st_magn_buffer_predisable(struct iio_dev *indio_dev) > { > - int err; > struct st_sensor_data *mdata = iio_priv(indio_dev); > + int err, err2; > > err = st_sensors_set_enable(indio_dev, false); > - if (err < 0) > - goto st_magn_buffer_predisable_error; > > - err = iio_triggered_buffer_predisable(indio_dev); > + err2 = iio_triggered_buffer_predisable(indio_dev); > + if (!err) > + err = err2; > > -st_magn_buffer_predisable_error: > kfree(mdata->buffer_data); > return err; > }
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c index 9dba93539a99..8d06643a042d 100644 --- a/drivers/iio/magnetometer/st_magn_buffer.c +++ b/drivers/iio/magnetometer/st_magn_buffer.c @@ -31,40 +31,36 @@ int st_magn_trig_set_state(struct iio_trigger *trig, bool state) static int st_magn_buffer_postenable(struct iio_dev *indio_dev) { - int err; struct st_sensor_data *mdata = iio_priv(indio_dev); + int err; mdata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_DMA | GFP_KERNEL); - if (mdata->buffer_data == NULL) { - err = -ENOMEM; - goto allocate_memory_error; - } + if (!mdata->buffer_data) + return -ENOMEM; err = iio_triggered_buffer_postenable(indio_dev); if (err < 0) - goto st_magn_buffer_postenable_error; + goto st_magn_free_buffer; return st_sensors_set_enable(indio_dev, true); -st_magn_buffer_postenable_error: +st_magn_free_buffer: kfree(mdata->buffer_data); -allocate_memory_error: return err; } static int st_magn_buffer_predisable(struct iio_dev *indio_dev) { - int err; struct st_sensor_data *mdata = iio_priv(indio_dev); + int err, err2; err = st_sensors_set_enable(indio_dev, false); - if (err < 0) - goto st_magn_buffer_predisable_error; - err = iio_triggered_buffer_predisable(indio_dev); + err2 = iio_triggered_buffer_predisable(indio_dev); + if (!err) + err = err2; -st_magn_buffer_predisable_error: kfree(mdata->buffer_data); return err; }
This patch is trying to cleanup for good the buffers operation functions. Let's rename the goto label using operation to perform and not where it fails. Signed-off-by: Denis Ciocca <denis.ciocca@st.com> --- drivers/iio/magnetometer/st_magn_buffer.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)