Diff
Modified: trunk/drivers/staging/iio/accel/adis16201_core.c (9071 => 9072)
--- trunk/drivers/staging/iio/accel/adis16201_core.c 2010-08-09 08:30:09 UTC (rev 9071)
+++ trunk/drivers/staging/iio/accel/adis16201_core.c 2010-08-10 06:46:40 UTC (rev 9072)
@@ -22,7 +22,6 @@
#include "../sysfs.h"
#include "accel.h"
#include "inclinometer.h"
-#include "../imu/volt.h"
#include "../gyro/gyro.h"
#include "../adc/adc.h"
@@ -418,12 +417,12 @@
return ret;
}
-static IIO_DEV_ATTR_VOLT(supply, adis16201_read_12bit_unsigned,
+static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16201_read_12bit_unsigned,
ADIS16201_SUPPLY_OUT);
-static IIO_CONST_ATTR(volt_supply_scale, "0.00122");
-static IIO_DEV_ATTR_VOLT(aux, adis16201_read_12bit_unsigned,
+static IIO_CONST_ATTR(in_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(0, adis16201_read_12bit_unsigned,
ADIS16201_AUX_ADC);
-static IIO_CONST_ATTR(volt_aux_scale, "0.00061");
+static IIO_CONST_ATTR(in0_scale, "0.00061");
static IIO_DEV_ATTR_ACCEL_X(adis16201_read_14bit_signed,
ADIS16201_XACCL_OUT);
@@ -457,7 +456,7 @@
static IIO_CONST_ATTR(temp_offset, "25");
static IIO_CONST_ATTR(temp_scale, "-0.47");
-static IIO_DEV_ATTR_RESET(adis16201_write_reset);
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0);
static IIO_CONST_ATTR(name, "adis16201");
@@ -470,15 +469,15 @@
};
static struct attribute *adis16201_attributes[] = {
- &iio_dev_attr_volt_supply.dev_attr.attr,
- &iio_const_attr_volt_supply_scale.dev_attr.attr,
+ &iio_dev_attr_in_supply_raw.dev_attr.attr,
+ &iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_temp.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
&iio_const_attr_name.dev_attr.attr,
- &iio_dev_attr_volt_aux.dev_attr.attr,
- &iio_const_attr_volt_aux_scale.dev_attr.attr,
+ &iio_dev_attr_in0_raw.dev_attr.attr,
+ &iio_const_attr_in0_scale.dev_attr.attr,
&iio_dev_attr_accel_x_raw.dev_attr.attr,
&iio_dev_attr_accel_y_raw.dev_attr.attr,
&iio_dev_attr_accel_x_offset.dev_attr.attr,
Modified: trunk/drivers/staging/iio/accel/adis16203_core.c (9071 => 9072)
--- trunk/drivers/staging/iio/accel/adis16203_core.c 2010-08-09 08:30:09 UTC (rev 9071)
+++ trunk/drivers/staging/iio/accel/adis16203_core.c 2010-08-10 06:46:40 UTC (rev 9072)
@@ -22,7 +22,6 @@
#include "../sysfs.h"
#include "accel.h"
#include "inclinometer.h"
-#include "../imu/volt.h"
#include "../gyro/gyro.h"
#include "../adc/adc.h"
@@ -370,12 +369,12 @@
return ret;
}
-static IIO_DEV_ATTR_VOLT(supply, adis16203_read_12bit_unsigned,
+static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16203_read_12bit_unsigned,
ADIS16203_SUPPLY_OUT);
-static IIO_CONST_ATTR(volt_supply_scale, "0.00122");
-static IIO_DEV_ATTR_VOLT(aux, adis16203_read_12bit_unsigned,
+static IIO_CONST_ATTR(in_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(0, adis16203_read_12bit_unsigned,
ADIS16203_AUX_ADC);
-static IIO_CONST_ATTR(volt_aux_scale, "0.00061");
+static IIO_CONST_ATTR(in0_scale, "0.00061");
static IIO_DEV_ATTR_INCLI_X(adis16203_read_14bit_signed,
ADIS16203_XINCL_OUT);
@@ -391,7 +390,7 @@
static IIO_CONST_ATTR(temp_offset, "25");
static IIO_CONST_ATTR(temp_scale, "-0.47");
-static IIO_DEV_ATTR_RESET(adis16203_write_reset);
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16203_write_reset, 0);
static IIO_CONST_ATTR(name, "adis16203");
@@ -404,15 +403,15 @@
};
static struct attribute *adis16203_attributes[] = {
- &iio_dev_attr_volt_supply.dev_attr.attr,
- &iio_const_attr_volt_supply_scale.dev_attr.attr,
+ &iio_dev_attr_in_supply_raw.dev_attr.attr,
+ &iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_temp.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
&iio_const_attr_name.dev_attr.attr,
- &iio_dev_attr_volt_aux.dev_attr.attr,
- &iio_const_attr_volt_aux_scale.dev_attr.attr,
+ &iio_dev_attr_in0_raw.dev_attr.attr,
+ &iio_const_attr_in0_scale.dev_attr.attr,
&iio_dev_attr_incli_x_raw.dev_attr.attr,
&iio_dev_attr_incli_y_raw.dev_attr.attr,
&iio_dev_attr_incli_x_offset.dev_attr.attr,
Modified: trunk/drivers/staging/iio/accel/adis16204_core.c (9071 => 9072)
--- trunk/drivers/staging/iio/accel/adis16204_core.c 2010-08-09 08:30:09 UTC (rev 9071)
+++ trunk/drivers/staging/iio/accel/adis16204_core.c 2010-08-10 06:46:40 UTC (rev 9072)
@@ -21,7 +21,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "accel.h"
-#include "../imu/volt.h"
#include "../gyro/gyro.h"
#include "../adc/adc.h"
@@ -394,12 +393,12 @@
return ret;
}
-static IIO_DEV_ATTR_VOLT(supply, adis16204_read_12bit_unsigned,
+static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16204_read_12bit_unsigned,
ADIS16204_SUPPLY_OUT);
-static IIO_CONST_ATTR(volt_supply_scale, "0.00122");
-static IIO_DEV_ATTR_VOLT(aux, adis16204_read_12bit_unsigned,
+static IIO_CONST_ATTR(in_supply_scale, "0.00122");
+static IIO_DEV_ATTR_IN_RAW(0, adis16204_read_12bit_unsigned,
ADIS16204_AUX_ADC);
-static IIO_CONST_ATTR(volt_aux_scale, "0.00061");
+static IIO_CONST_ATTR(in0_scale, "0.00061");
static IIO_DEV_ATTR_ACCEL_X(adis16204_read_14bit_signed,
ADIS16204_XACCL_OUT);
@@ -429,7 +428,7 @@
static IIO_CONST_ATTR(temp_offset, "25");
static IIO_CONST_ATTR(temp_scale, "-0.47");
-static IIO_DEV_ATTR_RESET(adis16204_write_reset);
+static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16204_write_reset, 0);
static IIO_CONST_ATTR(name, "adis16204");
@@ -442,15 +441,15 @@
};
static struct attribute *adis16204_attributes[] = {
- &iio_dev_attr_volt_supply.dev_attr.attr,
- &iio_const_attr_volt_supply_scale.dev_attr.attr,
+ &iio_dev_attr_in_supply_raw.dev_attr.attr,
+ &iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_temp.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
&iio_const_attr_name.dev_attr.attr,
- &iio_dev_attr_volt_aux.dev_attr.attr,
- &iio_const_attr_volt_aux_scale.dev_attr.attr,
+ &iio_dev_attr_in0_raw.dev_attr.attr,
+ &iio_const_attr_in0_scale.dev_attr.attr,
&iio_dev_attr_accel_x_raw.dev_attr.attr,
&iio_dev_attr_accel_y_raw.dev_attr.attr,
&iio_dev_attr_accel_xy.dev_attr.attr,
Modified: trunk/drivers/staging/iio/gyro/adis16261_core.c (9071 => 9072)
--- trunk/drivers/staging/iio/gyro/adis16261_core.c 2010-08-09 08:30:09 UTC (rev 9071)
+++ trunk/drivers/staging/iio/gyro/adis16261_core.c 2010-08-10 06:46:40 UTC (rev 9072)
@@ -21,7 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "gyro.h"
-#include "../imu/volt.h"
+#include "../adc/adc.h"
#include "adis16261.h"
@@ -549,9 +549,9 @@
return ret;
}
-static IIO_DEV_ATTR_VOLT(supply, adis16261_read_12bit_signed,
+static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16261_read_12bit_signed,
ADIS16261_SUPPLY_OUT);
-static IIO_CONST_ATTR(volt_supply_scale, "0.0018315");
+static IIO_CONST_ATTR(in_supply_scale, "0.0018315");
static IIO_DEV_ATTR_GYRO(adis16261_read_14bit_signed,
ADIS16261_GYRO_OUT);
@@ -568,9 +568,9 @@
static IIO_CONST_ATTR(temp_offset, "25 K");
static IIO_CONST_ATTR(temp_scale, "0.1453 K");
-static IIO_DEV_ATTR_VOLT(aux, adis16261_read_12bit_unsigned,
+static IIO_DEV_ATTR_IN_NAMED_RAW(aux, adis16261_read_12bit_unsigned,
ADIS16261_AUX_ADC);
-static IIO_CONST_ATTR(volt_aux_scale, "0.0006105");
+static IIO_CONST_ATTR(in_aux_scale, "0.0006105");
static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
adis16261_read_frequency,
@@ -593,8 +593,8 @@
};
static struct attribute *adis16261_attributes[] = {
- &iio_dev_attr_volt_supply.dev_attr.attr,
- &iio_const_attr_volt_supply_scale.dev_attr.attr,
+ &iio_dev_attr_in_supply_raw.dev_attr.attr,
+ &iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_gyro_raw.dev_attr.attr,
&iio_dev_attr_gyro_scale.dev_attr.attr,
&iio_dev_attr_gyro_offset.dev_attr.attr,
@@ -602,8 +602,8 @@
&iio_dev_attr_temp.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
- &iio_dev_attr_volt_aux.dev_attr.attr,
- &iio_const_attr_volt_aux_scale.dev_attr.attr,
+ &iio_dev_attr_in_aux_raw.dev_attr.attr,
+ &iio_const_attr_in_aux_scale.dev_attr.attr,
&iio_dev_attr_sampling_frequency.dev_attr.attr,
&iio_const_attr_available_sampling_frequency.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
Deleted: trunk/drivers/staging/iio/imu/volt.h (9071 => 9072)
--- trunk/drivers/staging/iio/imu/volt.h 2010-08-09 08:30:09 UTC (rev 9071)
+++ trunk/drivers/staging/iio/imu/volt.h 2010-08-10 06:46:40 UTC (rev 9072)
@@ -1,13 +0,0 @@
-/*
- * volt.h - sysfs attributes associated with ADCs or other voltage sensors
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * Copyright (c) 2008 Jonathan Cameron <[email protected]>
- *
- */
-
-#define IIO_DEV_ATTR_VOLT(_name, _show, _addr) \
- IIO_DEVICE_ATTR(volt_##_name, S_IRUGO, _show, NULL, _addr)
