diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-10-06 17:14:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 09:58:59 -0600 |
| commit | 2579a0df14b07042f8803a841affdc8bd37132ac (patch) | |
| tree | a9b2456a7a88ff1afc224a63666aa487dc943435 /drivers/staging/iio/accel/sca3000_core.c | |
| parent | f8c6f4e9a40d47ce86a641eb20fb7c5a59f06ff0 (diff) | |
staging:iio:accel:sca3000 dev_info to indio_dev renaming.
Again, there is a mix of the two names for the struct iio_dev.
Lets pick one and run with it.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index 5592b240ebf0..f2cdb1f38571 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -268,8 +268,8 @@ static ssize_t sca3000_show_rev(struct device *dev, char *buf) { int len = 0, ret; - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct sca3000_state *st = iio_priv(dev_info); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = iio_priv(indio_dev); mutex_lock(&st->lock); ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_REVID, 1); @@ -296,8 +296,8 @@ sca3000_show_available_measurement_modes(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct sca3000_state *st = iio_priv(dev_info); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = iio_priv(indio_dev); int len = 0; len += sprintf(buf + len, "0 - normal mode"); @@ -328,8 +328,8 @@ sca3000_show_measurement_mode(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct sca3000_state *st = iio_priv(dev_info); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = iio_priv(indio_dev); int len = 0, ret; mutex_lock(&st->lock); @@ -379,8 +379,8 @@ sca3000_store_measurement_mode(struct device *dev, const char *buf, size_t len) { - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct sca3000_state *st = iio_priv(dev_info); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = iio_priv(indio_dev); int ret; int mask = 0x03; long val; |