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 02/24] iio: Use dev_to_iio_dev()
Date: Sat, 12 May 2012 09:26:54 +0100 [thread overview]
Message-ID: <4FAE1ECE.2010309@kernel.org> (raw)
In-Reply-To: <1336741127-29552-2-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/iio/industrialio-buffer.c | 16 ++++++++--------
> drivers/iio/industrialio-core.c | 12 ++++++------
> drivers/iio/industrialio-event.c | 8 ++++----
> drivers/iio/industrialio-trigger.c | 4 ++--
> 4 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index b5b2c38..ac185b8 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -105,7 +105,7 @@ static ssize_t iio_scan_el_show(struct device *dev,
> char *buf)
> {
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
>
> ret = test_bit(to_iio_dev_attr(attr)->address,
> indio_dev->buffer->scan_mask);
> @@ -126,7 +126,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
> {
> int ret;
> bool state;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct iio_buffer *buffer = indio_dev->buffer;
> struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
>
> @@ -162,7 +162,7 @@ static ssize_t iio_scan_el_ts_show(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);
> return sprintf(buf, "%d\n", indio_dev->buffer->scan_timestamp);
> }
>
> @@ -172,7 +172,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
> size_t len)
> {
> int ret;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> bool state;
>
> ret = strtobool(buf, &state);
> @@ -352,7 +352,7 @@ ssize_t iio_buffer_read_length(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 iio_buffer *buffer = indio_dev->buffer;
>
> if (buffer->access->get_length)
> @@ -370,7 +370,7 @@ ssize_t iio_buffer_write_length(struct device *dev,
> {
> int ret;
> ulong val;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct iio_buffer *buffer = indio_dev->buffer;
>
> ret = strict_strtoul(buf, 10, &val);
> @@ -403,7 +403,7 @@ ssize_t iio_buffer_store_enable(struct device *dev,
> int ret;
> bool requested_state, current_state;
> int previous_mode;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct iio_buffer *buffer = indio_dev->buffer;
>
> mutex_lock(&indio_dev->mlock);
> @@ -489,7 +489,7 @@ ssize_t iio_buffer_show_enable(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);
> return sprintf(buf, "%d\n", iio_buffer_enabled(indio_dev));
> }
> EXPORT_SYMBOL(iio_buffer_show_enable);
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index dfa272d..ae3f5ed 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -264,7 +264,7 @@ static ssize_t iio_read_channel_ext_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> const struct iio_chan_spec_ext_info *ext_info;
>
> @@ -278,7 +278,7 @@ static ssize_t iio_write_channel_ext_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> const struct iio_chan_spec_ext_info *ext_info;
>
> @@ -292,7 +292,7 @@ static ssize_t iio_read_channel_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> int val, val2;
> int ret = indio_dev->info->read_raw(indio_dev, this_attr->c,
> @@ -322,7 +322,7 @@ static ssize_t iio_write_channel_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> int ret, integer = 0, fract = 0, fract_mult = 100000;
> bool integer_part = true, negative = false;
> @@ -630,7 +630,7 @@ static ssize_t iio_show_dev_name(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);
> return sprintf(buf, "%s\n", indio_dev->name);
> }
>
> @@ -716,7 +716,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
>
> static void iio_dev_release(struct device *device)
> {
> - struct iio_dev *indio_dev = container_of(device, struct iio_dev, dev);
> + struct iio_dev *indio_dev = dev_to_iio_dev(device);
> cdev_del(&indio_dev->chrdev);
> if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
> iio_device_unregister_trigger_consumer(indio_dev);
> diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
> index 5fcf50b..b49059d 100644
> --- a/drivers/iio/industrialio-event.c
> +++ b/drivers/iio/industrialio-event.c
> @@ -186,7 +186,7 @@ static ssize_t iio_ev_state_store(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> int ret;
> bool val;
> @@ -205,7 +205,7 @@ static ssize_t iio_ev_state_show(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> int val = indio_dev->info->read_event_config(indio_dev,
> this_attr->address);
> @@ -220,7 +220,7 @@ static ssize_t iio_ev_value_show(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> int val, ret;
>
> @@ -237,7 +237,7 @@ static ssize_t iio_ev_value_store(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> unsigned long val;
> int ret;
> diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
> index 1dbd7b8..0f582df 100644
> --- a/drivers/iio/industrialio-trigger.c
> +++ b/drivers/iio/industrialio-trigger.c
> @@ -310,7 +310,7 @@ static ssize_t iio_trigger_read_current(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);
>
> if (indio_dev->trig)
> return sprintf(buf, "%s\n", indio_dev->trig->name);
> @@ -329,7 +329,7 @@ static ssize_t iio_trigger_write_current(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 iio_trigger *oldtrig = indio_dev->trig;
> struct iio_trigger *trig;
> int ret;
next prev parent reply other threads:[~2012-05-12 8:26 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 [this message]
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
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=4FAE1ECE.2010309@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.