Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2579a0df authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f8c6f4e9

drivers/staging/iio/accel/sca3000_core.c

+8 −8
Original line number Diff line number Diff line
@@ -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;