diff options
| author | Irina Tirdea <irina.tirdea@intel.com> | 2016-03-24 12:29:26 +0300 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-04-03 12:27:40 +0300 |
| commit | 23e758b36898d5ff6cc0cd2e54c498b24a15b0dd (patch) | |
| tree | cf38b22c3d4545796361df04572e3772bf25d21f /drivers/iio/accel/bmc150-accel-core.c | |
| parent | 91307cbeca7fd372342aaea7e814a19156ee8e64 (diff) | |
| download | linux-23e758b36898d5ff6cc0cd2e54c498b24a15b0dd.tar.xz | |
iio: accel: bmc150: use available_scan_masks
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: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/accel/bmc150-accel-core.c')
| -rw-r--r-- | drivers/iio/accel/bmc150-accel-core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c index c73331f7782b..cc52366ad4ad 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -138,6 +138,7 @@ enum bmc150_accel_axis { AXIS_X, AXIS_Y, AXIS_Z, + AXIS_MAX, }; enum bmc150_power_modes { @@ -1104,6 +1105,10 @@ static const struct iio_info bmc150_accel_info_fifo = { .driver_module = THIS_MODULE, }; +static const unsigned long bmc150_accel_scan_masks[] = { + BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z), + 0}; + static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; @@ -1113,8 +1118,7 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p) unsigned int raw_val; 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 = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(bit), &raw_val, 2); @@ -1574,6 +1578,7 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, indio_dev->channels = data->chip_info->channels; indio_dev->num_channels = data->chip_info->num_channels; indio_dev->name = name ? name : data->chip_info->name; + indio_dev->available_scan_masks = bmc150_accel_scan_masks; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &bmc150_accel_info; |