diff options
author | Peter Meerwald <pmeerw@pmeerw.net> | 2013-09-18 17:47:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-21 07:04:48 -0400 |
commit | a97dd06948e6ba1ff4fa2e046dd573b4f42a45c1 (patch) | |
tree | 005a025408ec28f88daf71d5d93709630c1b75b9 | |
parent | 234efa1703ade3dc57a520829176378b26e831e0 (diff) |
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>
-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 { | |||
37 | 37 | ||
38 | static int mcp4725_suspend(struct device *dev) | 38 | static int mcp4725_suspend(struct device *dev) |
39 | { | 39 | { |
40 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 40 | struct mcp4725_data *data = iio_priv(i2c_get_clientdata( |
41 | struct mcp4725_data *data = iio_priv(indio_dev); | 41 | to_i2c_client(dev))); |
42 | u8 outbuf[2]; | 42 | u8 outbuf[2]; |
43 | 43 | ||
44 | outbuf[0] = (data->powerdown_mode + 1) << 4; | 44 | outbuf[0] = (data->powerdown_mode + 1) << 4; |
45 | outbuf[1] = 0; | 45 | outbuf[1] = 0; |
46 | data->powerdown = true; | 46 | data->powerdown = true; |
47 | 47 | ||
48 | return i2c_master_send(to_i2c_client(dev), outbuf, 2); | 48 | return i2c_master_send(data->client, outbuf, 2); |
49 | } | 49 | } |
50 | 50 | ||
51 | static int mcp4725_resume(struct device *dev) | 51 | static int mcp4725_resume(struct device *dev) |
52 | { | 52 | { |
53 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 53 | struct mcp4725_data *data = iio_priv(i2c_get_clientdata( |
54 | struct mcp4725_data *data = iio_priv(indio_dev); | 54 | to_i2c_client(dev))); |
55 | u8 outbuf[2]; | 55 | u8 outbuf[2]; |
56 | 56 | ||
57 | /* restore previous DAC value */ | 57 | /* restore previous DAC value */ |
@@ -59,7 +59,7 @@ static int mcp4725_resume(struct device *dev) | |||
59 | outbuf[1] = data->dac_value & 0xff; | 59 | outbuf[1] = data->dac_value & 0xff; |
60 | data->powerdown = false; | 60 | data->powerdown = false; |
61 | 61 | ||
62 | return i2c_master_send(to_i2c_client(dev), outbuf, 2); | 62 | return i2c_master_send(data->client, outbuf, 2); |
63 | } | 63 | } |
64 | 64 | ||
65 | #ifdef CONFIG_PM_SLEEP | 65 | #ifdef CONFIG_PM_SLEEP |