| Message ID | 1435916017-12859-8-git-send-email-irina.tirdea@intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On 03/07/15 10:33, Irina Tirdea wrote: > From: Adriana Reus <adriana.reus@intel.com> > > Use available_scan_masks to allow the iio core to select > the data to send to userspace depending on which axes are > enabled, instead of doing this in the driver's interrupt > handler. > > Signed-off-by: Adriana Reus <adriana.reus@intel.com> > Signed-off-by: Irina Tirdea <irina.tirdea@intel.com> Acked-by: Jonathan Cameron <jic23@kernel.org> > --- > drivers/iio/accel/kxcjk-1013.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c > index 51da369..4960397 100644 > --- a/drivers/iio/accel/kxcjk-1013.c > +++ b/drivers/iio/accel/kxcjk-1013.c > @@ -115,6 +115,7 @@ enum kxcjk1013_axis { > AXIS_X, > AXIS_Y, > AXIS_Z, > + AXIS_MAX, > }; > > enum kxcjk1013_mode { > @@ -947,6 +948,8 @@ static const struct iio_info kxcjk1013_info = { > .driver_module = THIS_MODULE, > }; > > +static const unsigned long kxcjk1013_scan_masks[] = {0x7, 0}; > + > static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) > { > struct iio_poll_func *pf = p; > @@ -956,8 +959,7 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) > > mutex_lock(&data->mutex); > > - for_each_set_bit(bit, indio_dev->active_scan_mask, > - indio_dev->masklength) { > + for (bit = 0; bit < AXIS_MAX; bit++) { > ret = kxcjk1013_get_acc_reg(data, bit); > if (ret < 0) { > mutex_unlock(&data->mutex); > @@ -1224,6 +1226,7 @@ static int kxcjk1013_probe(struct i2c_client *client, > indio_dev->dev.parent = &client->dev; > indio_dev->channels = kxcjk1013_channels; > indio_dev->num_channels = ARRAY_SIZE(kxcjk1013_channels); > + indio_dev->available_scan_masks = kxcjk1013_scan_masks; > indio_dev->name = name; > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->info = &kxcjk1013_info; > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index 51da369..4960397 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -115,6 +115,7 @@ enum kxcjk1013_axis { AXIS_X, AXIS_Y, AXIS_Z, + AXIS_MAX, }; enum kxcjk1013_mode { @@ -947,6 +948,8 @@ static const struct iio_info kxcjk1013_info = { .driver_module = THIS_MODULE, }; +static const unsigned long kxcjk1013_scan_masks[] = {0x7, 0}; + static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; @@ -956,8 +959,7 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) mutex_lock(&data->mutex); - for_each_set_bit(bit, indio_dev->active_scan_mask, - indio_dev->masklength) { + for (bit = 0; bit < AXIS_MAX; bit++) { ret = kxcjk1013_get_acc_reg(data, bit); if (ret < 0) { mutex_unlock(&data->mutex); @@ -1224,6 +1226,7 @@ static int kxcjk1013_probe(struct i2c_client *client, indio_dev->dev.parent = &client->dev; indio_dev->channels = kxcjk1013_channels; indio_dev->num_channels = ARRAY_SIZE(kxcjk1013_channels); + indio_dev->available_scan_masks = kxcjk1013_scan_masks; indio_dev->name = name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &kxcjk1013_info;