* [PATCH 2/4] iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 [PATCH 1/4] iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume Peter Meerwald
@ 2013-09-18 21:47 ` Peter Meerwald
2013-09-21 11:06 ` Jonathan Cameron
2013-09-18 21:47 ` [PATCH 3/4] iio: Fix mcp4725 " Peter Meerwald
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Peter Meerwald @ 2013-09-18 21:47 UTC (permalink / raw)
To: linux-iio; +Cc: Peter Meerwald, Oleksandr Kravchenko
dev_to_iio_dev() is a false friend
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
---
drivers/iio/accel/bma180.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 3eff246..9b0ad23 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -620,7 +620,7 @@ static int bma180_remove(struct i2c_client *client)
#ifdef CONFIG_PM_SLEEP
static int bma180_suspend(struct device *dev)
{
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
struct bma180_data *data = iio_priv(indio_dev);
int ret;
@@ -633,7 +633,7 @@ static int bma180_suspend(struct device *dev)
static int bma180_resume(struct device *dev)
{
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
struct bma180_data *data = iio_priv(indio_dev);
int ret;
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/4] iio: Fix bma180 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 ` [PATCH 2/4] iio: Fix bma180 " Peter Meerwald
@ 2013-09-21 11:06 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2013-09-21 11:06 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio, Oleksandr Kravchenko
On 09/18/13 22:47, Peter Meerwald wrote:
> dev_to_iio_dev() is a false friend
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Applied to the fixes togreg branch of iio.git
Thanks
> ---
> drivers/iio/accel/bma180.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
> index 3eff246..9b0ad23 100644
> --- a/drivers/iio/accel/bma180.c
> +++ b/drivers/iio/accel/bma180.c
> @@ -620,7 +620,7 @@ static int bma180_remove(struct i2c_client *client)
> #ifdef CONFIG_PM_SLEEP
> static int bma180_suspend(struct device *dev)
> {
> - struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> struct bma180_data *data = iio_priv(indio_dev);
> int ret;
>
> @@ -633,7 +633,7 @@ static int bma180_suspend(struct device *dev)
>
> static int bma180_resume(struct device *dev)
> {
> - struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> struct bma180_data *data = iio_priv(indio_dev);
> int ret;
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] iio: Fix mcp4725 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 [PATCH 1/4] iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume Peter Meerwald
2013-09-18 21:47 ` [PATCH 2/4] iio: Fix bma180 " Peter Meerwald
@ 2013-09-18 21:47 ` Peter Meerwald
2013-09-21 11:06 ` Jonathan Cameron
2013-09-18 21:47 ` [PATCH 4/4] iio: Fix tcs3472 " Peter Meerwald
2013-09-21 11:05 ` [PATCH 1/4] iio: Fix tmp006 " Jonathan Cameron
3 siblings, 1 reply; 8+ messages in thread
From: Peter Meerwald @ 2013-09-18 21:47 UTC (permalink / raw)
To: linux-iio; +Cc: Peter Meerwald
dev_to_iio_dev() is a false friend
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
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
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/4] iio: Fix mcp4725 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 ` [PATCH 3/4] iio: Fix mcp4725 " Peter Meerwald
@ 2013-09-21 11:06 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2013-09-21 11:06 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio
On 09/18/13 22:47, Peter Meerwald wrote:
> dev_to_iio_dev() is a false friend
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
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
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] iio: Fix tcs3472 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 [PATCH 1/4] iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume Peter Meerwald
2013-09-18 21:47 ` [PATCH 2/4] iio: Fix bma180 " Peter Meerwald
2013-09-18 21:47 ` [PATCH 3/4] iio: Fix mcp4725 " Peter Meerwald
@ 2013-09-18 21:47 ` Peter Meerwald
2013-09-21 11:20 ` Jonathan Cameron
2013-09-21 11:05 ` [PATCH 1/4] iio: Fix tmp006 " Jonathan Cameron
3 siblings, 1 reply; 8+ messages in thread
From: Peter Meerwald @ 2013-09-18 21:47 UTC (permalink / raw)
To: linux-iio; +Cc: Peter Meerwald
dev_to_iio_dev() is a false friend
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
drivers/iio/light/tcs3472.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
index 7bf2969..0b4ed57 100644
--- a/drivers/iio/light/tcs3472.c
+++ b/drivers/iio/light/tcs3472.c
@@ -330,12 +330,15 @@ static int tcs3472_remove(struct i2c_client *client)
#ifdef CONFIG_PM_SLEEP
static int tcs3472_suspend(struct device *dev)
{
- return tcs3472_powerdown(iio_priv(dev_to_iio_dev(dev)));
+ struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
+ to_i2c_client(dev)));
+ return tcs3472_powerdown(data);
}
static int tcs3472_resume(struct device *dev)
{
- struct tcs3472_data *data = iio_priv(dev_to_iio_dev(dev));
+ struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
+ to_i2c_client(dev)));
return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
data->enable | (TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
}
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 4/4] iio: Fix tcs3472 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 ` [PATCH 4/4] iio: Fix tcs3472 " Peter Meerwald
@ 2013-09-21 11:20 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2013-09-21 11:20 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio
On 09/18/13 22:47, Peter Meerwald wrote:
> dev_to_iio_dev() is a false friend
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/iio/light/tcs3472.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
> index 7bf2969..0b4ed57 100644
> --- a/drivers/iio/light/tcs3472.c
> +++ b/drivers/iio/light/tcs3472.c
> @@ -330,12 +330,15 @@ static int tcs3472_remove(struct i2c_client *client)
> #ifdef CONFIG_PM_SLEEP
> static int tcs3472_suspend(struct device *dev)
> {
> - return tcs3472_powerdown(iio_priv(dev_to_iio_dev(dev)));
> + struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
> + return tcs3472_powerdown(data);
> }
>
> static int tcs3472_resume(struct device *dev)
> {
> - struct tcs3472_data *data = iio_priv(dev_to_iio_dev(dev));
> + struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
> return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
> data->enable | (TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
> }
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume
2013-09-18 21:47 [PATCH 1/4] iio: Fix tmp006 dev-to-indio_dev conversion in suspend/resume Peter Meerwald
` (2 preceding siblings ...)
2013-09-18 21:47 ` [PATCH 4/4] iio: Fix tcs3472 " Peter Meerwald
@ 2013-09-21 11:05 ` Jonathan Cameron
3 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2013-09-21 11:05 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio
On 09/18/13 22:47, Peter Meerwald wrote:
> dev_to_iio_dev() is a false friend
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the fixes-togreg branch.
Thanks
> ---
> drivers/iio/temperature/tmp006.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
> index 4e95097..84a0789 100644
> --- a/drivers/iio/temperature/tmp006.c
> +++ b/drivers/iio/temperature/tmp006.c
> @@ -252,12 +252,14 @@ static int tmp006_remove(struct i2c_client *client)
> #ifdef CONFIG_PM_SLEEP
> static int tmp006_suspend(struct device *dev)
> {
> - return tmp006_powerdown(iio_priv(dev_to_iio_dev(dev)));
> + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> + return tmp006_powerdown(iio_priv(indio_dev));
> }
>
> static int tmp006_resume(struct device *dev)
> {
> - struct tmp006_data *data = iio_priv(dev_to_iio_dev(dev));
> + struct tmp006_data *data = iio_priv(i2c_get_clientdata(
> + to_i2c_client(dev)));
> return i2c_smbus_write_word_swapped(data->client, TMP006_CONFIG,
> data->config | TMP006_CONFIG_MOD_MASK);
> }
>
^ permalink raw reply [flat|nested] 8+ messages in thread