aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/iio/cdc/ad7746.c2
-rw-r--r--drivers/staging/iio/iio.h9
-rw-r--r--drivers/staging/iio/impedance-analyzer/ad5933.c1
-rw-r--r--drivers/staging/iio/industrialio-core.c5
-rw-r--r--drivers/staging/iio/light/isl29018.c1
-rw-r--r--drivers/staging/iio/light/isl29028.c1
-rw-r--r--drivers/staging/iio/light/tsl2563.c1
7 files changed, 0 insertions, 20 deletions
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 6c756056005..750bf4b0385 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -142,7 +142,6 @@ static const struct iio_chan_spec ad7746_channels[] = {
142 .type = IIO_TEMP, 142 .type = IIO_TEMP,
143 .indexed = 1, 143 .indexed = 1,
144 .channel = 0, 144 .channel = 0,
145 .processed_val = IIO_PROCESSED,
146 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, 145 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
147 .address = AD7746_REG_VT_DATA_HIGH << 8 | 146 .address = AD7746_REG_VT_DATA_HIGH << 8 |
148 AD7746_VTSETUP_VTMD_INT_TEMP, 147 AD7746_VTSETUP_VTMD_INT_TEMP,
@@ -151,7 +150,6 @@ static const struct iio_chan_spec ad7746_channels[] = {
151 .type = IIO_TEMP, 150 .type = IIO_TEMP,
152 .indexed = 1, 151 .indexed = 1,
153 .channel = 1, 152 .channel = 1,
154 .processed_val = IIO_PROCESSED,
155 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, 153 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
156 .address = AD7746_REG_VT_DATA_HIGH << 8 | 154 .address = AD7746_REG_VT_DATA_HIGH << 8 |
157 AD7746_VTSETUP_VTMD_EXT_TEMP, 155 AD7746_VTSETUP_VTMD_EXT_TEMP,
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index dda16028df1..a5627633834 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -19,12 +19,6 @@
19 * Currently assumes nano seconds. 19 * Currently assumes nano seconds.
20 */ 20 */
21 21
22enum iio_data_type {
23 IIO_RAW,
24 IIO_PROCESSED,
25};
26
27/* Could add the raw attributes as well - allowing buffer only devices */
28enum iio_chan_info_enum { 22enum iio_chan_info_enum {
29 IIO_CHAN_INFO_RAW = 0, 23 IIO_CHAN_INFO_RAW = 0,
30 IIO_CHAN_INFO_PROCESSED, 24 IIO_CHAN_INFO_PROCESSED,
@@ -146,8 +140,6 @@ struct iio_chan_spec_ext_info {
146 * correspond to the first name that the channel is referred 140 * correspond to the first name that the channel is referred
147 * to by in the datasheet (e.g. IND), or the nearest 141 * to by in the datasheet (e.g. IND), or the nearest
148 * possible compound name (e.g. IND-INC). 142 * possible compound name (e.g. IND-INC).
149 * @processed_val: Flag to specify the data access attribute should be
150 * *_input rather than *_raw.
151 * @modified: Does a modifier apply to this channel. What these are 143 * @modified: Does a modifier apply to this channel. What these are
152 * depends on the channel type. Modifier is set in 144 * depends on the channel type. Modifier is set in
153 * channel2. Examples are IIO_MOD_X for axial sensors about 145 * channel2. Examples are IIO_MOD_X for axial sensors about
@@ -176,7 +168,6 @@ struct iio_chan_spec {
176 const struct iio_chan_spec_ext_info *ext_info; 168 const struct iio_chan_spec_ext_info *ext_info;
177 const char *extend_name; 169 const char *extend_name;
178 const char *datasheet_name; 170 const char *datasheet_name;
179 unsigned processed_val:1;
180 unsigned modified:1; 171 unsigned modified:1;
181 unsigned indexed:1; 172 unsigned indexed:1;
182 unsigned output:1; 173 unsigned output:1;
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 9d5738aa427..93e5a716f9e 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -112,7 +112,6 @@ static struct iio_chan_spec ad5933_channels[] = {
112 { 112 {
113 .type = IIO_TEMP, 113 .type = IIO_TEMP,
114 .indexed = 1, 114 .indexed = 1,
115 .processed_val = 1,
116 .channel = 0, 115 .channel = 0,
117 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, 116 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
118 .address = AD5933_REG_TEMP_DATA, 117 .address = AD5933_REG_TEMP_DATA,
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 3ad04de3a87..db55b815a24 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -42,11 +42,6 @@ EXPORT_SYMBOL(iio_bus_type);
42 42
43static struct dentry *iio_debugfs_dentry; 43static struct dentry *iio_debugfs_dentry;
44 44
45static const char * const iio_data_type_name[] = {
46 [IIO_RAW] = "raw",
47 [IIO_PROCESSED] = "input",
48};
49
50static const char * const iio_direction[] = { 45static const char * const iio_direction[] = {
51 [0] = "in", 46 [0] = "in",
52 [1] = "out", 47 [1] = "out",
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 350f12c98ae..073e899e175 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -420,7 +420,6 @@ static const struct iio_chan_spec isl29018_channels[] = {
420 .type = IIO_LIGHT, 420 .type = IIO_LIGHT,
421 .indexed = 1, 421 .indexed = 1,
422 .channel = 0, 422 .channel = 0,
423 .processed_val = IIO_PROCESSED,
424 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT | 423 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
425 IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, 424 IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
426 }, { 425 }, {
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 11dc8a9e52a..4ac49aa344b 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -391,7 +391,6 @@ static const struct attribute_group isl29108_group = {
391static const struct iio_chan_spec isl29028_channels[] = { 391static const struct iio_chan_spec isl29028_channels[] = {
392 { 392 {
393 .type = IIO_LIGHT, 393 .type = IIO_LIGHT,
394 .processed_val = 1,
395 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT | 394 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
396 IIO_CHAN_INFO_SCALE_SEPARATE_BIT, 395 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
397 }, { 396 }, {
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index a334a889339..a1e5cbeb25a 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -535,7 +535,6 @@ static const struct iio_chan_spec tsl2563_channels[] = {
535 { 535 {
536 .type = IIO_LIGHT, 536 .type = IIO_LIGHT,
537 .indexed = 1, 537 .indexed = 1,
538 .processed_val = 1,
539 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, 538 .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
540 .channel = 0, 539 .channel = 0,
541 }, { 540 }, {