From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: linux-iio@vger.kernel.org,
device-drivers-devel@blackfin.uclinux.org, drivers@analog.com
Subject: Re: [PATCH 2/3] iio: capfun: ad7150: remove conversion mode handling.
Date: Fri, 19 Aug 2011 14:39:48 +0100 [thread overview]
Message-ID: <4E4E67A4.4060908@cam.ac.uk> (raw)
In-Reply-To: <1313757716-20557-2-git-send-email-michael.hennerich@analog.com>
On 08/19/11 13:41, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> The AD7150 family of devices power up in continues conversion mode.
> We can stay in this mode, unless power consumption becomes a real issue.
> Actually the event generation as well as the running average
> relies on continues conversion mode, so we better stay there.
Makes sense
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
(rather than ack as I'll handle this patch through the capfun branch)
- actually I'll sign off all 3 for that reason.
> ---
> drivers/staging/iio/adc/ad7150.c | 94 --------------------------------------
> 1 files changed, 0 insertions(+), 94 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7150.c b/drivers/staging/iio/adc/ad7150.c
> index fdf4da8..4bc5b20 100644
> --- a/drivers/staging/iio/adc/ad7150.c
> +++ b/drivers/staging/iio/adc/ad7150.c
> @@ -88,93 +88,10 @@ struct ad7150_chip_info {
> struct mutex state_lock;
> };
>
> -struct ad7150_conversion_mode {
> - char *name;
> - u8 reg_cfg;
> -};
> -
> -static struct ad7150_conversion_mode
> -ad7150_conv_mode_table[AD7150_MAX_CONV_MODE] = {
> - { "idle", 0 },
> - { "continuous-conversion", 1 },
> - { "single-conversion", 2 },
> - { "power-down", 3 },
> -};
> -
> /*
> * sysfs nodes
> */
>
> -#define IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(_show) \
> - IIO_DEVICE_ATTR(available_conversion_modes, S_IRUGO, _show, NULL, 0)
> -#define IIO_DEV_ATTR_CONVERSION_MODE(_mode, _show, _store) \
> - IIO_DEVICE_ATTR(conversion_mode, _mode, _show, _store, 0)
> -
> -static ssize_t ad7150_show_conversion_modes(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - int i;
> - int len = 0;
> -
> - for (i = 0; i < AD7150_MAX_CONV_MODE; i++)
> - len += sprintf(buf + len, "%s\n",
> - ad7150_conv_mode_table[i].name);
> -
> - return len;
> -}
> -
> -static IIO_DEV_ATTR_AVAIL_CONVERSION_MODES(ad7150_show_conversion_modes);
> -
> -static ssize_t ad7150_show_conversion_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct ad7150_chip_info *chip = iio_priv(dev_info);
> -
> - return sprintf(buf, "%s\n", chip->conversion_mode);
> -}
> -
> -static ssize_t ad7150_store_conversion_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct ad7150_chip_info *chip = iio_priv(dev_info);
> - u8 cfg;
> - int i, ret;
> -
> - ret = i2c_smbus_read_byte_data(chip->client, AD7150_CFG);
> - if (ret < 0)
> - return ret;
> - cfg = ret;
> -
> - for (i = 0; i < AD7150_MAX_CONV_MODE; i++) {
> - if (strncmp(buf, ad7150_conv_mode_table[i].name,
> - strlen(ad7150_conv_mode_table[i].name) - 1) ==
> - 0) {
> - chip->conversion_mode = ad7150_conv_mode_table[i].name;
> - cfg |= 0x18 | ad7150_conv_mode_table[i].reg_cfg;
> - ret = i2c_smbus_write_byte_data(chip->client,
> - AD7150_CFG,
> - cfg);
> - if (ret < 0)
> - return ret;
> - return len;
> - }
> - }
> -
> - dev_err(dev, "not supported conversion mode\n");
> -
> - return -EINVAL;
> -}
> -
> -static IIO_DEV_ATTR_CONVERSION_MODE(S_IRUGO | S_IWUSR,
> - ad7150_show_conversion_mode,
> - ad7150_store_conversion_mode);
> -
> static const u8 ad7150_addresses[][6] = {
> { AD7150_CH1_DATA_HIGH, AD7150_CH1_AVG_HIGH,
> AD7150_CH1_SETUP, AD7150_CH1_THR_HOLD_H,
> @@ -542,16 +459,6 @@ static const struct iio_chan_spec ad7150_channels[] = {
> },
> };
>
> -static struct attribute *ad7150_attributes[] = {
> - &iio_dev_attr_available_conversion_modes.dev_attr.attr,
> - &iio_dev_attr_conversion_mode.dev_attr.attr,
> - NULL,
> -};
> -
> -static const struct attribute_group ad7150_attribute_group = {
> - .attrs = ad7150_attributes,
> -};
> -
> /*
> * threshold events
> */
> @@ -636,7 +543,6 @@ static struct attribute_group ad7150_event_attribute_group = {
> };
>
> static const struct iio_info ad7150_info = {
> - .attrs = &ad7150_attribute_group,
> .event_attrs = &ad7150_event_attribute_group,
> .driver_module = THIS_MODULE,
> .read_raw = &ad7150_read_raw,
next prev parent reply other threads:[~2011-08-19 13:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 12:41 [PATCH 1/3] iio: capfun: fix typo michael.hennerich
2011-08-19 12:41 ` [PATCH 2/3] iio: capfun: ad7150: remove conversion mode handling michael.hennerich
2011-08-19 13:39 ` Jonathan Cameron [this message]
2011-08-22 11:48 ` Hennerich, Michael
2011-08-19 12:41 ` [PATCH 3/3] iio: capfun: AD7150: Add support for the second interrupt strobe michael.hennerich
2011-08-19 13:38 ` Jonathan Cameron
2011-08-19 13:48 ` Jonathan Cameron
2011-08-19 13:50 ` Jonathan Cameron
2011-08-19 12:51 ` [PATCH 1/3] iio: capfun: fix typo 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=4E4E67A4.4060908@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=michael.hennerich@analog.com \
/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.