Commit ee8c5419 authored by Irina Tirdea's avatar Irina Tirdea Committed by Jonathan Cameron

iio: gyro: bmg160: 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: default avatarIrina Tirdea <irina.tirdea@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 1715e0cc
...@@ -116,6 +116,7 @@ enum bmg160_axis { ...@@ -116,6 +116,7 @@ enum bmg160_axis {
AXIS_X, AXIS_X,
AXIS_Y, AXIS_Y,
AXIS_Z, AXIS_Z,
AXIS_MAX,
}; };
static const struct { static const struct {
...@@ -763,6 +764,10 @@ static const struct iio_info bmg160_info = { ...@@ -763,6 +764,10 @@ static const struct iio_info bmg160_info = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
}; };
static const unsigned long bmg160_accel_scan_masks[] = {
BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z),
0};
static irqreturn_t bmg160_trigger_handler(int irq, void *p) static irqreturn_t bmg160_trigger_handler(int irq, void *p)
{ {
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
...@@ -772,8 +777,7 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p) ...@@ -772,8 +777,7 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)
unsigned int val; unsigned int val;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
for_each_set_bit(bit, indio_dev->active_scan_mask, for (bit = 0; bit < AXIS_MAX; bit++) {
indio_dev->masklength) {
ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(bit), ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(bit),
&val, 2); &val, 2);
if (ret < 0) { if (ret < 0) {
...@@ -1019,6 +1023,7 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, ...@@ -1019,6 +1023,7 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
indio_dev->channels = bmg160_channels; indio_dev->channels = bmg160_channels;
indio_dev->num_channels = ARRAY_SIZE(bmg160_channels); indio_dev->num_channels = ARRAY_SIZE(bmg160_channels);
indio_dev->name = name; indio_dev->name = name;
indio_dev->available_scan_masks = bmg160_accel_scan_masks;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &bmg160_info; indio_dev->info = &bmg160_info;
......
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