Re: [PATCH 21/24] staging:iio:magnetometer: Use dev_to_iio_dev()

[Jonathan Cameron <jic23@kernel.org>]

On 05/11/2012 01:58 PM, Lars-Peter Clausen wrote:
> Replace open-coded instances of getting a iio_dev struct from a device struct
> with dev_to_iio_dev().
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
>  drivers/staging/iio/magnetometer/ak8975.c  |    4 ++--
>  drivers/staging/iio/magnetometer/hmc5843.c |   16 ++++++++--------
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
> index 93026c5..5834e4a 100644
> --- a/drivers/staging/iio/magnetometer/ak8975.c
> +++ b/drivers/staging/iio/magnetometer/ak8975.c
> @@ -242,7 +242,7 @@ static int ak8975_setup(struct i2c_client *client)
>  static ssize_t show_mode(struct device *dev, struct device_attribute *devattr,
>  			 char *buf)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct ak8975_data *data = iio_priv(indio_dev);
>  
>  	return sprintf(buf, "%u\n", data->mode);
> @@ -255,7 +255,7 @@ static ssize_t show_mode(struct device *dev, struct device_attribute *devattr,
>  static ssize_t store_mode(struct device *dev, struct device_attribute *devattr,
>  			  const char *buf, size_t count)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct ak8975_data *data = iio_priv(indio_dev);
>  	struct i2c_client *client = data->client;
>  	bool value;
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index 3ec6518..e3e65ea 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -184,7 +184,7 @@ static ssize_t hmc5843_show_operating_mode(struct device *dev,
>  					struct device_attribute *attr,
>  					char *buf)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct hmc5843_data *data = iio_priv(indio_dev);
>  	return sprintf(buf, "%d\n", data->operating_mode);
>  }
> @@ -194,7 +194,7 @@ static ssize_t hmc5843_set_operating_mode(struct device *dev,
>  				const char *buf,
>  				size_t count)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
>  	struct hmc5843_data *data = iio_priv(indio_dev);
>  	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> @@ -260,7 +260,7 @@ static ssize_t hmc5843_show_measurement_configuration(struct device *dev,
>  						struct device_attribute *attr,
>  						char *buf)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct hmc5843_data *data = iio_priv(indio_dev);
>  	return sprintf(buf, "%d\n", data->meas_conf);
>  }
> @@ -270,7 +270,7 @@ static ssize_t hmc5843_set_measurement_configuration(struct device *dev,
>  						const char *buf,
>  						size_t count)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
>  	struct hmc5843_data *data = i2c_get_clientdata(client);
>  	unsigned long meas_conf = 0;
> @@ -331,7 +331,7 @@ static ssize_t set_sampling_frequency(struct device *dev,
>  					const char *buf, size_t count)
>  {
>  
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
>  	struct hmc5843_data *data = iio_priv(indio_dev);
>  	unsigned long rate = 0;
> @@ -369,7 +369,7 @@ exit:
>  static ssize_t show_sampling_frequency(struct device *dev,
>  			struct device_attribute *attr, char *buf)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
>  	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>  	s32 rate;
> @@ -404,7 +404,7 @@ static ssize_t show_range(struct device *dev,
>  				char *buf)
>  {
>  	u8 range;
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct hmc5843_data *data = iio_priv(indio_dev);
>  
>  	range = data->range;
> @@ -416,7 +416,7 @@ static ssize_t set_range(struct device *dev,
>  			const char *buf,
>  			size_t count)
>  {
> -	struct iio_dev *indio_dev = dev_get_drvdata(dev);
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>  	struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
>  	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>  	struct hmc5843_data *data = iio_priv(indio_dev);