From: Hartmut Knaack <knaack.h@gmx.de>
To: Jonathan Cameron <jic23@kernel.org>, linux-iio@vger.kernel.org
Cc: kristina.martsenko@gmail.com, Denis Ciocca <denis.ciocca@st.com>
Subject: Re: [PATCH 1/7] iio:st sensors: remove custom sampling frequence attribute in favour of core support.
Date: Sun, 29 Jun 2014 13:27:57 +0200 [thread overview]
Message-ID: <53AFF83D.9020901@gmx.de> (raw)
In-Reply-To: <1403467186-26639-2-git-send-email-jic23@kernel.org>
Jonathan Cameron schrieb:
> This allows in kernel client drivers to access this
>
> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
> Cc: Denis Ciocca <denis.ciocca@st.com>
Reviewed-by: Hartmut Knaack <knaack.h@gmx.de>
> ---
Good job!
> drivers/iio/accel/st_accel_core.c | 12 ++++++++--
> drivers/iio/common/st_sensors/st_sensors_core.c | 29 -------------------------
> drivers/iio/gyro/st_gyro_core.c | 12 ++++++++--
> drivers/iio/magnetometer/st_magn_core.c | 12 ++++++++--
> drivers/iio/pressure/st_pressure_core.c | 27 +++++++++++++++++++++--
> include/linux/iio/common/st_sensors.h | 12 +---------
> 6 files changed, 56 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index a2abf7c..0878648 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -393,6 +393,9 @@ static int st_accel_read_raw(struct iio_dev *indio_dev,
> *val = 0;
> *val2 = adata->current_fullscale->gain;
> return IIO_VAL_INT_PLUS_MICRO;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + *val = adata->odr;
> + return IIO_VAL_INT;
> default:
> return -EINVAL;
> }
> @@ -410,6 +413,13 @@ static int st_accel_write_raw(struct iio_dev *indio_dev,
> case IIO_CHAN_INFO_SCALE:
> err = st_sensors_set_fullscale_by_gain(indio_dev, val2);
> break;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + if (val2)
> + return -EINVAL;
> + mutex_lock(&indio_dev->mlock);
> + err = st_sensors_set_odr(indio_dev, val);
> + mutex_unlock(&indio_dev->mlock);
> + return err;
> default:
> return -EINVAL;
> }
> @@ -417,14 +427,12 @@ static int st_accel_write_raw(struct iio_dev *indio_dev,
> return err;
> }
>
> -static ST_SENSOR_DEV_ATTR_SAMP_FREQ();
> static ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL();
> static ST_SENSORS_DEV_ATTR_SCALE_AVAIL(in_accel_scale_available);
>
> static struct attribute *st_accel_attributes[] = {
> &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
> &iio_dev_attr_in_accel_scale_available.dev_attr.attr,
> - &iio_dev_attr_sampling_frequency.dev_attr.attr,
> NULL,
> };
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index e8b932f..30fb640 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -463,35 +463,6 @@ read_wai_error:
> }
> EXPORT_SYMBOL(st_sensors_check_device_support);
>
> -ssize_t st_sensors_sysfs_get_sampling_frequency(struct device *dev,
> - struct device_attribute *attr, char *buf)
> -{
> - struct st_sensor_data *adata = iio_priv(dev_get_drvdata(dev));
> -
> - return sprintf(buf, "%d\n", adata->odr);
> -}
> -EXPORT_SYMBOL(st_sensors_sysfs_get_sampling_frequency);
> -
> -ssize_t st_sensors_sysfs_set_sampling_frequency(struct device *dev,
> - struct device_attribute *attr, const char *buf, size_t size)
> -{
> - int err;
> - unsigned int odr;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -
> - err = kstrtoint(buf, 10, &odr);
> - if (err < 0)
> - goto conversion_error;
> -
> - mutex_lock(&indio_dev->mlock);
> - err = st_sensors_set_odr(indio_dev, odr);
> - mutex_unlock(&indio_dev->mlock);
> -
> -conversion_error:
> - return err < 0 ? err : size;
> -}
> -EXPORT_SYMBOL(st_sensors_sysfs_set_sampling_frequency);
> -
> ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
> index ed74a90..f156fc6 100644
> --- a/drivers/iio/gyro/st_gyro_core.c
> +++ b/drivers/iio/gyro/st_gyro_core.c
> @@ -245,6 +245,9 @@ static int st_gyro_read_raw(struct iio_dev *indio_dev,
> *val = 0;
> *val2 = gdata->current_fullscale->gain;
> return IIO_VAL_INT_PLUS_MICRO;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + *val = gdata->odr;
> + return IIO_VAL_INT;
> default:
> return -EINVAL;
> }
> @@ -262,6 +265,13 @@ static int st_gyro_write_raw(struct iio_dev *indio_dev,
> case IIO_CHAN_INFO_SCALE:
> err = st_sensors_set_fullscale_by_gain(indio_dev, val2);
> break;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + if (val2)
> + return -EINVAL;
> + mutex_lock(&indio_dev->mlock);
> + err = st_sensors_set_odr(indio_dev, val);
> + mutex_unlock(&indio_dev->mlock);
> + return err;
> default:
> err = -EINVAL;
> }
> @@ -269,14 +279,12 @@ static int st_gyro_write_raw(struct iio_dev *indio_dev,
> return err;
> }
>
> -static ST_SENSOR_DEV_ATTR_SAMP_FREQ();
> static ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL();
> static ST_SENSORS_DEV_ATTR_SCALE_AVAIL(in_anglvel_scale_available);
>
> static struct attribute *st_gyro_attributes[] = {
> &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
> &iio_dev_attr_in_anglvel_scale_available.dev_attr.attr,
> - &iio_dev_attr_sampling_frequency.dev_attr.attr,
> NULL,
> };
>
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index 240a21d..a4b6413 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -299,6 +299,9 @@ static int st_magn_read_raw(struct iio_dev *indio_dev,
> else
> *val2 = mdata->current_fullscale->gain;
> return IIO_VAL_INT_PLUS_MICRO;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + *val = mdata->odr;
> + return IIO_VAL_INT;
> default:
> return -EINVAL;
> }
> @@ -316,6 +319,13 @@ static int st_magn_write_raw(struct iio_dev *indio_dev,
> case IIO_CHAN_INFO_SCALE:
> err = st_sensors_set_fullscale_by_gain(indio_dev, val2);
> break;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + if (val2)
> + return -EINVAL;
> + mutex_lock(&indio_dev->mlock);
> + err = st_sensors_set_odr(indio_dev, val);
> + mutex_unlock(&indio_dev->mlock);
> + return err;
> default:
> err = -EINVAL;
> }
> @@ -323,14 +333,12 @@ static int st_magn_write_raw(struct iio_dev *indio_dev,
> return err;
> }
>
> -static ST_SENSOR_DEV_ATTR_SAMP_FREQ();
> static ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL();
> static ST_SENSORS_DEV_ATTR_SCALE_AVAIL(in_magn_scale_available);
>
> static struct attribute *st_magn_attributes[] = {
> &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
> &iio_dev_attr_in_magn_scale_available.dev_attr.attr,
> - &iio_dev_attr_sampling_frequency.dev_attr.attr,
> NULL,
> };
>
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index cd7e01f..473d914 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -307,6 +307,27 @@ static const struct st_sensors st_press_sensors[] = {
> },
> };
>
> +static int st_press_write_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *ch,
> + int val,
> + int val2,
> + long mask)
> +{
> + int err;
> +
> + switch (mask) {
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + if (val2)
> + return -EINVAL;
> + mutex_lock(&indio_dev->mlock);
> + err = st_sensors_set_odr(indio_dev, val);
> + mutex_unlock(&indio_dev->mlock);
> + return err;
> + default:
> + return -EINVAL;
> + }
> +}
> +
> static int st_press_read_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *ch, int *val,
> int *val2, long mask)
> @@ -349,6 +370,9 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
> }
>
> return IIO_VAL_FRACTIONAL;
> + case IIO_CHAN_INFO_SAMP_FREQ:
> + *val = pdata->odr;
> + return IIO_VAL_INT;
> default:
> return -EINVAL;
> }
> @@ -357,12 +381,10 @@ read_error:
> return err;
> }
>
> -static ST_SENSOR_DEV_ATTR_SAMP_FREQ();
> static ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL();
>
> static struct attribute *st_press_attributes[] = {
> &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
> - &iio_dev_attr_sampling_frequency.dev_attr.attr,
> NULL,
> };
>
> @@ -374,6 +396,7 @@ static const struct iio_info press_info = {
> .driver_module = THIS_MODULE,
> .attrs = &st_press_attribute_group,
> .read_raw = &st_press_read_raw,
> + .write_raw = &st_press_write_raw,
> };
>
> #ifdef CONFIG_IIO_TRIGGER
> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
> index 96f51f0..d8257ab 100644
> --- a/include/linux/iio/common/st_sensors.h
> +++ b/include/linux/iio/common/st_sensors.h
> @@ -47,6 +47,7 @@
> .type = device_type, \
> .modified = mod, \
> .info_mask_separate = mask, \
> + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
> .scan_index = index, \
> .channel2 = ch2, \
> .address = addr, \
> @@ -59,11 +60,6 @@
> }, \
> }
>
> -#define ST_SENSOR_DEV_ATTR_SAMP_FREQ() \
> - IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO, \
> - st_sensors_sysfs_get_sampling_frequency, \
> - st_sensors_sysfs_set_sampling_frequency)
> -
> #define ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL() \
> IIO_DEV_ATTR_SAMP_FREQ_AVAIL( \
> st_sensors_sysfs_sampling_frequency_avail)
> @@ -285,12 +281,6 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
> int st_sensors_check_device_support(struct iio_dev *indio_dev,
> int num_sensors_list, const struct st_sensors *sensors);
>
> -ssize_t st_sensors_sysfs_get_sampling_frequency(struct device *dev,
> - struct device_attribute *attr, char *buf);
> -
> -ssize_t st_sensors_sysfs_set_sampling_frequency(struct device *dev,
> - struct device_attribute *attr, const char *buf, size_t size);
> -
> ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
> struct device_attribute *attr, char *buf);
>
next prev parent reply other threads:[~2014-06-29 11:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-22 19:59 [PATCH 0/7] Move more drivers to using samp_freq element of info_mask Jonathan Cameron
2014-06-22 19:59 ` [PATCH 1/7] iio:st sensors: remove custom sampling frequence attribute in favour of core support Jonathan Cameron
2014-06-29 11:27 ` Hartmut Knaack [this message]
2014-07-07 9:04 ` Jonathan Cameron
2014-06-22 19:59 ` [PATCH 2/7] iio: gyro: itg3200 switch sampling frequency attr to " Jonathan Cameron
2014-06-29 12:04 ` Hartmut Knaack
2014-07-07 9:04 ` Jonathan Cameron
2014-06-22 19:59 ` [PATCH 3/7] iio: imu: mpu6050 " Jonathan Cameron
2014-06-29 12:53 ` Hartmut Knaack
2014-06-22 19:59 ` [PATCH 4/7] iio: gyro: adis16136 " Jonathan Cameron
2014-06-29 13:58 ` Hartmut Knaack
2014-06-22 19:59 ` [PATCH 5/7] iio: adis: Switch " Jonathan Cameron
2014-06-29 15:27 ` Hartmut Knaack
2014-06-30 8:48 ` Lars-Peter Clausen
2014-07-07 9:03 ` Jonathan Cameron
2014-06-22 19:59 ` [PATCH 6/7] iio: imu: adis16400 switch " Jonathan Cameron
2014-06-29 15:36 ` Hartmut Knaack
2014-06-30 8:14 ` Lars-Peter Clausen
2014-07-07 9:03 ` Jonathan Cameron
2014-06-22 19:59 ` [PATCH 7/7] iio: imu: adis16480 " Jonathan Cameron
2014-06-29 15:46 ` Hartmut Knaack
2014-06-30 8:13 ` Lars-Peter Clausen
2014-07-07 9:02 ` 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=53AFF83D.9020901@gmx.de \
--to=knaack.h@gmx.de \
--cc=denis.ciocca@st.com \
--cc=jic23@kernel.org \
--cc=kristina.martsenko@gmail.com \
--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.