AXIS_X,
        AXIS_Y,
        AXIS_Z,
+       AXIS_MAX,
 };
 
 static const struct {
        .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)
 {
        struct iio_poll_func *pf = p;
        unsigned int 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, BMG160_AXIS_TO_REG(bit),
                                       &val, 2);
                if (ret < 0) {
        indio_dev->channels = bmg160_channels;
        indio_dev->num_channels = ARRAY_SIZE(bmg160_channels);
        indio_dev->name = name;
+       indio_dev->available_scan_masks = bmg160_accel_scan_masks;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &bmg160_info;