Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / iio / accel / lis3l02dq_ring.c

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index a68a381..330d5d6 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -75,22 +75,30 @@ error_ret:
        return ret;
 
 }
-static IIO_SCAN_EL_C(accel_x, 0, IIO_SIGNED(16),
+static IIO_SCAN_EL_C(accel_x, 0,
                     LIS3L02DQ_REG_OUT_X_L_ADDR,
                     &lis3l02dq_scan_el_set_state);
-static IIO_SCAN_EL_C(accel_y, 1, IIO_SIGNED(16),
+static IIO_SCAN_EL_C(accel_y, 1,
                     LIS3L02DQ_REG_OUT_Y_L_ADDR,
                     &lis3l02dq_scan_el_set_state);
-static IIO_SCAN_EL_C(accel_z, 2, IIO_SIGNED(16),
+static IIO_SCAN_EL_C(accel_z, 2,
                     LIS3L02DQ_REG_OUT_Z_L_ADDR,
                     &lis3l02dq_scan_el_set_state);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 12, 16);
 static IIO_SCAN_EL_TIMESTAMP(3);
+static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
 
 static struct attribute *lis3l02dq_scan_el_attrs[] = {
        &iio_scan_el_accel_x.dev_attr.attr,
+       &iio_const_attr_accel_x_index.dev_attr.attr,
        &iio_scan_el_accel_y.dev_attr.attr,
+       &iio_const_attr_accel_y_index.dev_attr.attr,
        &iio_scan_el_accel_z.dev_attr.attr,
+       &iio_const_attr_accel_z_index.dev_attr.attr,
+       &iio_const_attr_accel_type.dev_attr.attr,
        &iio_scan_el_timestamp.dev_attr.attr,
+       &iio_const_attr_timestamp_index.dev_attr.attr,
+       &iio_const_attr_timestamp_type.dev_attr.attr,
        NULL,
 };
 
@@ -382,7 +390,8 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig,
                                 &t);
        return ret;
 }
-static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+
+static IIO_TRIGGER_NAME_ATTR;
 
 static struct attribute *lis3l02dq_trigger_attrs[] = {
        &dev_attr_name.attr,