Re: [PATCH 4/4] iio: core: iio_chan_spec_ext_info: Add private handle

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4/27/2012 8:55 AM, Hennerich, Michael wrote:
michael.hennerich@xxxxxxxxxx wrote on 2012-04-26:
From: Michael Hennerich<michael.hennerich@xxxxxxxxxx>

There is currently no user, but we might need it in future.
So better add it now, before we have to convert drivers afterwards.
Hi Jonathan,

Do you Ack this one as well?

This patch is really meant to avoid code duplication,
in case you have multiple ext_info entries which could share the same
call[back] functions. This way we set private with dedicated value,
which then helps to differentiate the actions.

I made private type uintptr_t, in order to also hold a pointer if
required.
No problem with this. Sorry, got called away and forgot about it!

I'm not entirely sure these ext_info bits are the best way to do things, but
there are far more important bits of the subsystem to work on for now
and I don't have a better idea!

-Michael


Signed-off-by: Michael Hennerich<michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>
---
  drivers/iio/industrialio-core.c  |    5 +++--
  drivers/staging/iio/dac/ad5064.c |   12 +++++++-----
  drivers/staging/iio/dac/ad5446.c |    6 +++++-
  include/linux/iio/iio.h          |   11 +++++++----
  4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/industrialio-core.c
b/drivers/iio/industrialio-core.c index 1c55d2b..8f72ab8 100644 ---
a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c
@@ -281,7 +281,7 @@ static ssize_t iio_read_channel_ext_info(struct
device *dev,

       ext_info =&this_attr->c->ext_info[this_attr->address];
-     return ext_info->read(indio_dev, this_attr->c, buf);
+     return ext_info->read(indio_dev, ext_info->private, this_attr->c,
buf);
  }

  static ssize_t iio_write_channel_ext_info(struct device *dev,
@@ -295,7 +295,8 @@ static ssize_t iio_write_channel_ext_info(struct
device *dev,

       ext_info =&this_attr->c->ext_info[this_attr->address];
-     return ext_info->write(indio_dev, this_attr->c, buf, len);
+     return ext_info->write(indio_dev, ext_info->private,
+                            this_attr->c, buf, len);
  }

  static ssize_t iio_read_channel_info(struct device *dev,
diff --git a/drivers/staging/iio/dac/ad5064.c
b/drivers/staging/iio/dac/ad5064.c index c0fad4f..e06f1d1 100644 ---
a/drivers/staging/iio/dac/ad5064.c +++
b/drivers/staging/iio/dac/ad5064.c @@ -144,14 +144,14 @@ static const
char ad5064_powerdown_modes[][15] = {
  };

  static ssize_t ad5064_read_powerdown_mode_available(struct iio_dev
*indio_dev,
-     const struct iio_chan_spec *chan, char *buf)
+     uintptr_t private, const struct iio_chan_spec *chan, char *buf)
  {
       return sprintf(buf, "%s %s %s\n", ad5064_powerdown_modes[1],
               ad5064_powerdown_modes[2], ad5064_powerdown_modes[3]);
  }

  static ssize_t ad5064_read_powerdown_mode(struct iio_dev *indio_dev,
-     const struct iio_chan_spec *chan, char *buf)
+     uintptr_t private, const struct iio_chan_spec *chan, char *buf)
  {
       struct ad5064_state *st = iio_priv(indio_dev);
@@ -160,7 +160,8 @@ static ssize_t ad5064_read_powerdown_mode(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5064_write_powerdown_mode(struct iio_dev *indio_dev,
-     const struct iio_chan_spec *chan, const char *buf, size_t len)
+     uintptr_t private, const struct iio_chan_spec *chan, const char *buf,
+     size_t len)
  {
       struct ad5064_state *st = iio_priv(indio_dev);
       unsigned int mode, i;
@@ -187,7 +188,7 @@ static ssize_t ad5064_write_powerdown_mode(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5064_read_dac_powerdown(struct iio_dev *indio_dev,
-     const struct iio_chan_spec *chan, char *buf)
+     uintptr_t private, const struct iio_chan_spec *chan, char *buf)
  {
       struct ad5064_state *st = iio_priv(indio_dev);
@@ -195,7 +196,8 @@ static ssize_t ad5064_read_dac_powerdown(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5064_write_dac_powerdown(struct iio_dev *indio_dev,
-     const struct iio_chan_spec *chan, const char *buf, size_t len) +
uintptr_t private, const struct iio_chan_spec *chan, const char *buf, +
size_t len)
  {
       struct ad5064_state *st = iio_priv(indio_dev);
       bool pwr_down;
diff --git a/drivers/staging/iio/dac/ad5446.c
b/drivers/staging/iio/dac/ad5446.c index 62ad1d5..55e34d4 100644 ---
a/drivers/staging/iio/dac/ad5446.c +++
b/drivers/staging/iio/dac/ad5446.c @@ -46,13 +46,14 @@ static const char
* const ad5446_powerdown_modes[] = {
  };

  static ssize_t ad5446_read_powerdown_mode_available(struct iio_dev
*indio_dev,
-     const struct iio_chan_spec *chan, char *buf)
+     uintptr_t private, const struct iio_chan_spec *chan, char *buf)
  {
       return sprintf(buf, "%s %s %s\n", ad5446_powerdown_modes[1],
               ad5446_powerdown_modes[2], ad5446_powerdown_modes[3]);
  }

  static ssize_t ad5446_write_powerdown_mode(struct iio_dev *indio_dev,
  +                                        uintptr_t private,                                      const struct iio_chan_spec *chan,
                                           const char *buf, size_t len) {
@@ -73,6 +74,7 @@ static ssize_t ad5446_write_powerdown_mode(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5446_read_powerdown_mode(struct iio_dev *indio_dev,
  +                                       uintptr_t private,                                      const struct iio_chan_spec *chan,
                                          char *buf) {
@@ -82,6 +84,7 @@ static ssize_t ad5446_read_powerdown_mode(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5446_read_dac_powerdown(struct iio_dev *indio_dev,
  +                                       uintptr_t private,                                      const struct iio_chan_spec *chan,
                                          char *buf) {
@@ -91,6 +94,7 @@ static ssize_t ad5446_read_dac_powerdown(struct
iio_dev *indio_dev,
  }

  static ssize_t ad5446_write_dac_powerdown(struct iio_dev *indio_dev,
  +                                        uintptr_t private,                                      const struct iio_chan_spec *chan,
                                           const char *buf, size_t len) {
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 0e826af..263b430 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -111,14 +111,17 @@ struct iio_dev;
   * @shared:  Whether this attribute is shared between all channels. *
   @read:      Read callback for this info attribute, may be NULL. *
   @write:     Write callback for this info attribute, may be NULL. + *
   @private:   Data private to the driver. */
  struct iio_chan_spec_ext_info {
       const char *name;
       bool shared;
-     ssize_t (*read)(struct iio_dev *, struct iio_chan_spec const *,
-                     char *buf);
-     ssize_t (*write)(struct iio_dev *, struct iio_chan_spec const *,
-                     const char *buf, size_t len);
+     ssize_t (*read)(struct iio_dev *, uintptr_t private,
+                     struct iio_chan_spec const *, char *buf);
+     ssize_t (*write)(struct iio_dev *, uintptr_t private,
+                      struct iio_chan_spec const *, const char *buf,
+                      size_t len);
+     uintptr_t private;
  };

  /**
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif



--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux