Commit 3cfd6464 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron

iio: proximity: sx9500: fix iio_triggered_buffer_{predisable,postenable} positions

The iio_triggered_buffer_predisable() should be called last, to detach the
poll func after the devices has been suspended.

This change re-organizes things a bit so that the postenable & predisable
are symmetrical. It also converts the preenable() to a postenable().

Not stable material as there is no known problem with the current
code, it's just not consistent with the form we would like all the
IIO drivers to adopt so as to allow subsystem wide changes.
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 2c3d0c9f
...@@ -675,11 +675,15 @@ static irqreturn_t sx9500_trigger_handler(int irq, void *private) ...@@ -675,11 +675,15 @@ static irqreturn_t sx9500_trigger_handler(int irq, void *private)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int sx9500_buffer_preenable(struct iio_dev *indio_dev) static int sx9500_buffer_postenable(struct iio_dev *indio_dev)
{ {
struct sx9500_data *data = iio_priv(indio_dev); struct sx9500_data *data = iio_priv(indio_dev);
int ret = 0, i; int ret = 0, i;
ret = iio_triggered_buffer_postenable(indio_dev);
if (ret)
return ret;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
for (i = 0; i < SX9500_NUM_CHANNELS; i++) for (i = 0; i < SX9500_NUM_CHANNELS; i++)
...@@ -696,6 +700,9 @@ static int sx9500_buffer_preenable(struct iio_dev *indio_dev) ...@@ -696,6 +700,9 @@ static int sx9500_buffer_preenable(struct iio_dev *indio_dev)
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
if (ret)
iio_triggered_buffer_predisable(indio_dev);
return ret; return ret;
} }
...@@ -704,8 +711,6 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev) ...@@ -704,8 +711,6 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)
struct sx9500_data *data = iio_priv(indio_dev); struct sx9500_data *data = iio_priv(indio_dev);
int ret = 0, i; int ret = 0, i;
iio_triggered_buffer_predisable(indio_dev);
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
for (i = 0; i < SX9500_NUM_CHANNELS; i++) for (i = 0; i < SX9500_NUM_CHANNELS; i++)
...@@ -722,12 +727,13 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev) ...@@ -722,12 +727,13 @@ static int sx9500_buffer_predisable(struct iio_dev *indio_dev)
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
iio_triggered_buffer_predisable(indio_dev);
return ret; return ret;
} }
static const struct iio_buffer_setup_ops sx9500_buffer_setup_ops = { static const struct iio_buffer_setup_ops sx9500_buffer_setup_ops = {
.preenable = sx9500_buffer_preenable, .postenable = sx9500_buffer_postenable,
.postenable = iio_triggered_buffer_postenable,
.predisable = sx9500_buffer_predisable, .predisable = sx9500_buffer_predisable,
}; };
......
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