diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2013-09-18 23:47:00 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-21 13:04:48 +0200 |
| commit | a97dd06948e6ba1ff4fa2e046dd573b4f42a45c1 (patch) | |
| tree | 005a025408ec28f88daf71d5d93709630c1b75b9 /drivers | |
| parent | iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume (diff) | |
| download | linux-a97dd06948e6ba1ff4fa2e046dd573b4f42a45c1.tar.xz linux-a97dd06948e6ba1ff4fa2e046dd573b4f42a45c1.zip | |
iio: Fix mcp4725 dev-to-indio_dev conversion in suspend/resume
dev_to_iio_dev() is a false friend
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/dac/mcp4725.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c index 1f4a48e6a82c..1397b6e0e414 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 |