From fccb29d99f51078cb118a9b53d9f802ee46bfc5d Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:50 +0200 Subject: [PATCH] --- yaml --- r: 304683 b: refs/heads/master c: dedb1e77aabaad8d91c1aad5f92f127cecd27c3f h: refs/heads/master i: 304681: 397687776525ca487d5d09af4d92464ddd6d3102 304679: 07c5539e9a9ad5d3062c505e807696476bfd79f2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/imu/adis16400_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b4938cab8f6b..b54b13b07e82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba86dc46b80e6907b05dd1c7bc1e88f3dacde2dc +refs/heads/master: dedb1e77aabaad8d91c1aad5f92f127cecd27c3f diff --git a/trunk/drivers/staging/iio/imu/adis16400_core.c b/trunk/drivers/staging/iio/imu/adis16400_core.c index 5015f823b65f..1f6bd854e950 100644 --- a/trunk/drivers/staging/iio/imu/adis16400_core.c +++ b/trunk/drivers/staging/iio/imu/adis16400_core.c @@ -179,7 +179,7 @@ static ssize_t adis16400_read_frequency(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_dev *indio_dev = dev_to_iio_dev(dev); int ret, len = 0; ret = adis16400_get_freq(indio_dev); if (ret < 0) @@ -225,7 +225,7 @@ static ssize_t adis16400_write_frequency(struct device *dev, const char *buf, size_t len) { - struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct adis16400_state *st = iio_priv(indio_dev); long val; int ret; @@ -279,7 +279,7 @@ static ssize_t adis16400_write_reset(struct device *dev, if (ret < 0) return ret; if (val) { - ret = adis16400_reset(dev_get_drvdata(dev)); + ret = adis16400_reset(dev_to_iio_dev(dev)); if (ret < 0) return ret; }