On 09/18/13 22:47, Peter Meerwald wrote:
> dev_to_iio_dev() is a false friend
>
> Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx>
Applied to the fixes-togreg branch of iio.git
Thanks
> ---
> drivers/iio/dac/mcp4725.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
> index 6711a33..7a42d85 100644
> --- a/drivers/iio/dac/mcp4725.c
> +++ b/drivers/iio/dac/mcp4725.c
> @@ -37,21 +37,21 @@ struct mcp4725_data {
>
> static int mcp4725_suspend(struct device *dev)
> {
> - struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> - struct mcp4725_data *data = iio_priv(indio_dev);
> + struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
> u8 outbuf[2];
>
> outbuf[0] = (data->powerdown_mode + 1) << 4;
> outbuf[1] = 0;
> data->powerdown = true;
>
> - return i2c_master_send(to_i2c_client(dev), outbuf, 2);
> + return i2c_master_send(data->client, outbuf, 2);
> }
>
> static int mcp4725_resume(struct device *dev)
> {
> - struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> - struct mcp4725_data *data = iio_priv(indio_dev);
> + struct mcp4725_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
> u8 outbuf[2];
>
> /* restore previous DAC value */
> @@ -59,7 +59,7 @@ static int mcp4725_resume(struct device *dev)
> outbuf[1] = data->dac_value & 0xff;
> data->powerdown = false;
>
> - return i2c_master_send(to_i2c_client(dev), outbuf, 2);
> + return i2c_master_send(data->client, outbuf, 2);
> }
>
> #ifdef CONFIG_PM_SLEEP
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
