Commit 251640a7 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio: drop procesed_val element of chan_spec.

There is no longer any need for this as we have separate
info_mask elements for raw and processed value reads.
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75a973c7
...@@ -142,7 +142,6 @@ static const struct iio_chan_spec ad7746_channels[] = { ...@@ -142,7 +142,6 @@ static const struct iio_chan_spec ad7746_channels[] = {
.type = IIO_TEMP, .type = IIO_TEMP,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.processed_val = IIO_PROCESSED,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.address = AD7746_REG_VT_DATA_HIGH << 8 | .address = AD7746_REG_VT_DATA_HIGH << 8 |
AD7746_VTSETUP_VTMD_INT_TEMP, AD7746_VTSETUP_VTMD_INT_TEMP,
...@@ -151,7 +150,6 @@ static const struct iio_chan_spec ad7746_channels[] = { ...@@ -151,7 +150,6 @@ static const struct iio_chan_spec ad7746_channels[] = {
.type = IIO_TEMP, .type = IIO_TEMP,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.processed_val = IIO_PROCESSED,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.address = AD7746_REG_VT_DATA_HIGH << 8 | .address = AD7746_REG_VT_DATA_HIGH << 8 |
AD7746_VTSETUP_VTMD_EXT_TEMP, AD7746_VTSETUP_VTMD_EXT_TEMP,
......
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
* Currently assumes nano seconds. * Currently assumes nano seconds.
*/ */
enum iio_data_type {
IIO_RAW,
IIO_PROCESSED,
};
/* Could add the raw attributes as well - allowing buffer only devices */
enum iio_chan_info_enum { enum iio_chan_info_enum {
IIO_CHAN_INFO_RAW = 0, IIO_CHAN_INFO_RAW = 0,
IIO_CHAN_INFO_PROCESSED, IIO_CHAN_INFO_PROCESSED,
...@@ -146,8 +140,6 @@ struct iio_chan_spec_ext_info { ...@@ -146,8 +140,6 @@ struct iio_chan_spec_ext_info {
* correspond to the first name that the channel is referred * correspond to the first name that the channel is referred
* to by in the datasheet (e.g. IND), or the nearest * to by in the datasheet (e.g. IND), or the nearest
* possible compound name (e.g. IND-INC). * possible compound name (e.g. IND-INC).
* @processed_val: Flag to specify the data access attribute should be
* *_input rather than *_raw.
* @modified: Does a modifier apply to this channel. What these are * @modified: Does a modifier apply to this channel. What these are
* depends on the channel type. Modifier is set in * depends on the channel type. Modifier is set in
* channel2. Examples are IIO_MOD_X for axial sensors about * channel2. Examples are IIO_MOD_X for axial sensors about
...@@ -176,7 +168,6 @@ struct iio_chan_spec { ...@@ -176,7 +168,6 @@ struct iio_chan_spec {
const struct iio_chan_spec_ext_info *ext_info; const struct iio_chan_spec_ext_info *ext_info;
const char *extend_name; const char *extend_name;
const char *datasheet_name; const char *datasheet_name;
unsigned processed_val:1;
unsigned modified:1; unsigned modified:1;
unsigned indexed:1; unsigned indexed:1;
unsigned output:1; unsigned output:1;
......
...@@ -112,7 +112,6 @@ static struct iio_chan_spec ad5933_channels[] = { ...@@ -112,7 +112,6 @@ static struct iio_chan_spec ad5933_channels[] = {
{ {
.type = IIO_TEMP, .type = IIO_TEMP,
.indexed = 1, .indexed = 1,
.processed_val = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.address = AD5933_REG_TEMP_DATA, .address = AD5933_REG_TEMP_DATA,
......
...@@ -42,11 +42,6 @@ EXPORT_SYMBOL(iio_bus_type); ...@@ -42,11 +42,6 @@ EXPORT_SYMBOL(iio_bus_type);
static struct dentry *iio_debugfs_dentry; static struct dentry *iio_debugfs_dentry;
static const char * const iio_data_type_name[] = {
[IIO_RAW] = "raw",
[IIO_PROCESSED] = "input",
};
static const char * const iio_direction[] = { static const char * const iio_direction[] = {
[0] = "in", [0] = "in",
[1] = "out", [1] = "out",
......
...@@ -420,7 +420,6 @@ static const struct iio_chan_spec isl29018_channels[] = { ...@@ -420,7 +420,6 @@ static const struct iio_chan_spec isl29018_channels[] = {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.processed_val = IIO_PROCESSED,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT | .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
}, { }, {
......
...@@ -391,7 +391,6 @@ static const struct attribute_group isl29108_group = { ...@@ -391,7 +391,6 @@ static const struct attribute_group isl29108_group = {
static const struct iio_chan_spec isl29028_channels[] = { static const struct iio_chan_spec isl29028_channels[] = {
{ {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.processed_val = 1,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT | .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
}, { }, {
......
...@@ -535,7 +535,6 @@ static const struct iio_chan_spec tsl2563_channels[] = { ...@@ -535,7 +535,6 @@ static const struct iio_chan_spec tsl2563_channels[] = {
{ {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.processed_val = 1,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
.channel = 0, .channel = 0,
}, { }, {
......
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