Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1195195

[PATCH 4/7] iio: bmg160: Use generic dev_drvdata

Show all headers | View raw

i2c_get_clientdata() is specifically for i2c. Replace it with the
generic dev_get/set_drvdata() to support different protocols.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 drivers/iio/gyro/bmg160.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 71c605ea85ad..b47b7af19e32 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -1022,7 +1022,7 @@ static int bmg160_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	data = iio_priv(indio_dev);
-	i2c_set_clientdata(client, indio_dev);
+	dev_set_drvdata(&client->dev, indio_dev);
 	data->dev = &client->dev;
 
 	ret = bmg160_chip_init(data);
@@ -1156,7 +1156,7 @@ static int bmg160_remove(struct i2c_client *client)
 #ifdef CONFIG_PM_SLEEP
 static int bmg160_suspend(struct device *dev)
 {
-	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct bmg160_data *data = iio_priv(indio_dev);
 
 	mutex_lock(&data->mutex);
@@ -1168,7 +1168,7 @@ static int bmg160_suspend(struct device *dev)
 
 static int bmg160_resume(struct device *dev)
 {
-	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct bmg160_data *data = iio_priv(indio_dev);
 
 	mutex_lock(&data->mutex);
@@ -1184,7 +1184,7 @@ static int bmg160_resume(struct device *dev)
 #ifdef CONFIG_PM
 static int bmg160_runtime_suspend(struct device *dev)
 {
-	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct bmg160_data *data = iio_priv(indio_dev);
 	int ret;
 
@@ -1199,7 +1199,7 @@ static int bmg160_runtime_suspend(struct device *dev)
 
 static int bmg160_runtime_resume(struct device *dev)
 {
-	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct bmg160_data *data = iio_priv(indio_dev);
 	int ret;
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] iio: bmg160: Add SPI connection Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
  [PATCH 4/7] iio: bmg160: Use generic dev_drvdata Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
  [PATCH 3/7] iio: bmg160: Remove i2c_client from data struct Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
  [PATCH 1/7] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
    Re: [PATCH 1/7] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are  required Jonathan Cameron <jic23@kernel.org> - 2015-08-02 20:40 +0200
  [PATCH 5/7] iio: bmg160: Remove remaining uses of i2c_client Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
  [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200
    Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c  access Paul Bolle <pebolle@tiscali.nl> - 2015-07-30 12:50 +0200
  [PATCH 6/7] iio: bmg160: Separate i2c and core driver Markus Pargmann <mpa@pengutronix.de> - 2015-07-29 15:50 +0200

csiph-web