Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304490
b: refs/heads/master
c: fc6d113
h: refs/heads/master
v: v3
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent fac554b commit adf86bc
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73e016ef94d801bd0278959606d2f72f07a2abab
refs/heads/master: fc6d11398e22a3b2cfd7c3b8421653c6075b624b
5 changes: 3 additions & 2 deletions trunk/drivers/iio/industrialio-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
12 changes: 7 additions & 5 deletions trunk/drivers/staging/iio/dac/ad5064.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;
Expand All @@ -187,15 +188,16 @@ 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);

return sprintf(buf, "%d\n", st->pwr_down[chan->channel]);
}

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;
Expand Down
6 changes: 5 additions & 1 deletion trunk/drivers/staging/iio/dac/ad5446.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand Down
11 changes: 7 additions & 4 deletions trunk/include/linux/iio/iio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down

0 comments on commit adf86bc

Please sign in to comment.