From: Jonathan Cameron <jic23@kernel.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: Jonathan Cameron <jic23@cam.ac.uk>, linux-iio@vger.kernel.org
Subject: Re: [PATCH 15/24] staging:iio:dac: Use dev_to_iio_dev()
Date: Sat, 12 May 2012 09:45:48 +0100 [thread overview]
Message-ID: <4FAE233C.4030100@kernel.org> (raw)
In-Reply-To: <1336741127-29552-15-git-send-email-lars@metafoo.de>
On 05/11/2012 01:58 PM, Lars-Peter Clausen wrote:
> Replace open-coded instances of getting a iio_dev struct from a device struct
> with dev_to_iio_dev().
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
> drivers/staging/iio/dac/ad5360.c | 4 ++--
> drivers/staging/iio/dac/ad5380.c | 8 ++++----
> drivers/staging/iio/dac/ad5504.c | 8 ++++----
> drivers/staging/iio/dac/ad5624r_spi.c | 8 ++++----
> drivers/staging/iio/dac/ad5686.c | 8 ++++----
> drivers/staging/iio/dac/ad5791.c | 8 ++++----
> drivers/staging/iio/dac/max517.c | 4 ++--
> 7 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/staging/iio/dac/ad5360.c b/drivers/staging/iio/dac/ad5360.c
> index 26cac42..38660ef 100644
> --- a/drivers/staging/iio/dac/ad5360.c
> +++ b/drivers/staging/iio/dac/ad5360.c
> @@ -251,7 +251,7 @@ static ssize_t ad5360_read_dac_powerdown(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);
> struct ad5360_state *st = iio_priv(indio_dev);
>
> return sprintf(buf, "%d\n", (bool)(st->ctrl & AD5360_SF_CTRL_PWR_DOWN));
> @@ -279,7 +279,7 @@ static int ad5360_update_ctrl(struct iio_dev *indio_dev, unsigned int set,
> static ssize_t ad5360_write_dac_powerdown(struct device *dev,
> struct device_attribute *attr, 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);
> bool pwr_down;
> int ret;
>
> diff --git a/drivers/staging/iio/dac/ad5380.c b/drivers/staging/iio/dac/ad5380.c
> index 4afb099..370d284 100644
> --- a/drivers/staging/iio/dac/ad5380.c
> +++ b/drivers/staging/iio/dac/ad5380.c
> @@ -168,7 +168,7 @@ static const struct ad5380_chip_info ad5380_chip_info_tbl[] = {
> static ssize_t ad5380_read_dac_powerdown(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);
> struct ad5380_state *st = iio_priv(indio_dev);
>
> return sprintf(buf, "%d\n", st->pwr_down);
> @@ -177,7 +177,7 @@ static ssize_t ad5380_read_dac_powerdown(struct device *dev,
> static ssize_t ad5380_write_dac_powerdown(struct device *dev,
> struct device_attribute *attr, 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 ad5380_state *st = iio_priv(indio_dev);
> bool pwr_down;
> int ret;
> @@ -213,7 +213,7 @@ static const char ad5380_powerdown_modes[][15] = {
> static ssize_t ad5380_read_powerdown_mode(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);
> struct ad5380_state *st = iio_priv(indio_dev);
> unsigned int mode;
> int ret;
> @@ -230,7 +230,7 @@ static ssize_t ad5380_read_powerdown_mode(struct device *dev,
> static ssize_t ad5380_write_powerdown_mode(struct device *dev,
> struct device_attribute *attr, 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 ad5380_state *st = iio_priv(indio_dev);
> unsigned int i;
> int ret;
> diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c
> index e47f4d0..019cf15 100644
> --- a/drivers/staging/iio/dac/ad5504.c
> +++ b/drivers/staging/iio/dac/ad5504.c
> @@ -125,7 +125,7 @@ static int ad5504_write_raw(struct iio_dev *indio_dev,
> static ssize_t ad5504_read_powerdown_mode(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);
> struct ad5504_state *st = iio_priv(indio_dev);
>
> const char mode[][14] = {"20kohm_to_gnd", "three_state"};
> @@ -137,7 +137,7 @@ static ssize_t ad5504_write_powerdown_mode(struct device *dev,
> struct device_attribute *attr,
> 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 ad5504_state *st = iio_priv(indio_dev);
> int ret;
>
> @@ -155,7 +155,7 @@ static ssize_t ad5504_read_dac_powerdown(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);
> struct ad5504_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> @@ -169,7 +169,7 @@ static ssize_t ad5504_write_dac_powerdown(struct device *dev,
> {
> long readin;
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct ad5504_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
> index cde4a9f..42ff644 100644
> --- a/drivers/staging/iio/dac/ad5624r_spi.c
> +++ b/drivers/staging/iio/dac/ad5624r_spi.c
> @@ -141,7 +141,7 @@ static int ad5624r_write_raw(struct iio_dev *indio_dev,
> static ssize_t ad5624r_read_powerdown_mode(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);
> struct ad5624r_state *st = iio_priv(indio_dev);
>
> char mode[][15] = {"", "1kohm_to_gnd", "100kohm_to_gnd", "three_state"};
> @@ -153,7 +153,7 @@ static ssize_t ad5624r_write_powerdown_mode(struct device *dev,
> struct device_attribute *attr,
> 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 ad5624r_state *st = iio_priv(indio_dev);
> int ret;
>
> @@ -173,7 +173,7 @@ static ssize_t ad5624r_read_dac_powerdown(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);
> struct ad5624r_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> @@ -187,7 +187,7 @@ static ssize_t ad5624r_write_dac_powerdown(struct device *dev,
> {
> long readin;
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct ad5624r_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/staging/iio/dac/ad5686.c
> index 6a74436..c1e903e 100644
> --- a/drivers/staging/iio/dac/ad5686.c
> +++ b/drivers/staging/iio/dac/ad5686.c
> @@ -173,7 +173,7 @@ static int ad5686_spi_read(struct ad5686_state *st, u8 addr)
> static ssize_t ad5686_read_powerdown_mode(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);
> struct ad5686_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> @@ -187,7 +187,7 @@ static ssize_t ad5686_write_powerdown_mode(struct device *dev,
> struct device_attribute *attr,
> 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 ad5686_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> unsigned mode;
> @@ -211,7 +211,7 @@ static ssize_t ad5686_read_dac_powerdown(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);
> struct ad5686_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> @@ -225,7 +225,7 @@ static ssize_t ad5686_write_dac_powerdown(struct device *dev,
> {
> bool readin;
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct ad5686_state *st = iio_priv(indio_dev);
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> diff --git a/drivers/staging/iio/dac/ad5791.c b/drivers/staging/iio/dac/ad5791.c
> index 1cc75e6..13d8b5b 100644
> --- a/drivers/staging/iio/dac/ad5791.c
> +++ b/drivers/staging/iio/dac/ad5791.c
> @@ -94,7 +94,7 @@ static const struct iio_chan_spec ad5791_channels[] = {
> static ssize_t ad5791_read_powerdown_mode(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);
> struct ad5791_state *st = iio_priv(indio_dev);
>
> const char mode[][14] = {"6kohm_to_gnd", "three_state"};
> @@ -106,7 +106,7 @@ static ssize_t ad5791_write_powerdown_mode(struct device *dev,
> struct device_attribute *attr,
> 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 ad5791_state *st = iio_priv(indio_dev);
> int ret;
>
> @@ -124,7 +124,7 @@ static ssize_t ad5791_read_dac_powerdown(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);
> struct ad5791_state *st = iio_priv(indio_dev);
>
> return sprintf(buf, "%d\n", st->pwr_down);
> @@ -136,7 +136,7 @@ static ssize_t ad5791_write_dac_powerdown(struct device *dev,
> {
> long readin;
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct ad5791_state *st = iio_priv(indio_dev);
>
> ret = strict_strtol(buf, 10, &readin);
> diff --git a/drivers/staging/iio/dac/max517.c b/drivers/staging/iio/dac/max517.c
> index 65d6349..5287cad 100644
> --- a/drivers/staging/iio/dac/max517.c
> +++ b/drivers/staging/iio/dac/max517.c
> @@ -59,7 +59,7 @@ static ssize_t max517_set_value(struct device *dev,
> struct device_attribute *attr,
> const char *buf, size_t count, int channel)
> {
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct max517_data *data = iio_priv(indio_dev);
> struct i2c_client *client = data->client;
> u8 outbuf[4]; /* 1x or 2x command + value */
> @@ -128,7 +128,7 @@ static ssize_t max517_show_scale(struct device *dev,
> struct device_attribute *attr,
> char *buf, int channel)
> {
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct max517_data *data = iio_priv(indio_dev);
> /* Corresponds to Vref / 2^(bits) */
> unsigned int scale_uv = (data->vref_mv[channel - 1] * 1000) >> 8;
next prev parent reply other threads:[~2012-05-12 8:45 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-11 12:58 [PATCH 01/24] iio: Add dev_to_iio_dev() helper function Lars-Peter Clausen
2012-05-11 12:58 ` [PATCH 02/24] iio: Use dev_to_iio_dev() Lars-Peter Clausen
2012-05-12 8:26 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 03/24] staging:iio:adis16203_read_ring_data: Pass IIO device directly Lars-Peter Clausen
2012-05-12 8:28 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 04/24] staging:iio:adis16204_read_ring_data: " Lars-Peter Clausen
2012-05-12 8:28 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 05/24] staging:iio:adis16209_read_ring_data: " Lars-Peter Clausen
2012-05-12 8:30 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 06/24] staging:iio:adis16240_read_ring_data: " Lars-Peter Clausen
2012-05-12 8:31 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 07/24] staging:iio:__lis3l02dq_write_data_ready_config: " Lars-Peter Clausen
2012-05-12 8:34 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 08/24] staging:iio:adis16260_read_ring_data: " Lars-Peter Clausen
2012-05-12 8:35 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 09/24] staging:iio:ade7758_spi_read_burst: " Lars-Peter Clausen
2012-05-12 8:35 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 10/24] staging:iio:adis16400_ring: " Lars-Peter Clausen
2012-05-12 8:36 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 11/24] staging:iio:adc: Use dev_to_iio_dev() Lars-Peter Clausen
2012-05-12 8:40 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 12/24] staging:iio:accel: " Lars-Peter Clausen
2012-05-12 8:43 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 13/24] staging:iio:addac: " Lars-Peter Clausen
2012-05-12 8:44 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 14/24] staging:iio:cdc: " Lars-Peter Clausen
2012-05-12 8:45 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 15/24] staging:iio:dac: " Lars-Peter Clausen
2012-05-12 8:45 ` Jonathan Cameron [this message]
2012-05-11 12:58 ` [PATCH 16/24] staging:iio:frequency: " Lars-Peter Clausen
2012-05-12 8:46 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 17/24] staging:iio:gyro: " Lars-Peter Clausen
2012-05-12 8:46 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 18/24] staging:iio:impedance-analyzer: " Lars-Peter Clausen
2012-05-12 8:47 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 19/24] staging:iio:imu: " Lars-Peter Clausen
2012-05-12 8:47 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 20/24] staging:iio:light: " Lars-Peter Clausen
2012-05-12 8:48 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 21/24] staging:iio:magnetometer: " Lars-Peter Clausen
2012-05-12 8:49 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 22/24] staging:iio:resolver: " Lars-Peter Clausen
2012-05-12 8:49 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 23/24] staging:iio:meter: " Lars-Peter Clausen
2012-05-12 8:50 ` Jonathan Cameron
2012-05-11 12:58 ` [PATCH 24/24] iio: Free up drvdata for driver usage Lars-Peter Clausen
2012-05-12 8:51 ` Jonathan Cameron
2012-05-12 9:08 ` [PATCH 01/24] iio: Add dev_to_iio_dev() helper function Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FAE233C.4030100@kernel.org \
--to=jic23@kernel.org \
--cc=jic23@cam.ac.uk \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.