diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2013-01-31 22:43:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-02-02 12:58:46 +0100 |
| commit | ca7d98dbd7db6aa8bc4b08e26be1249436d21af3 (patch) | |
| tree | b0a094e0a28b62adace30b549a550305064a72d7 /drivers | |
| parent | iio/adc: (max1363) Fix data conversion problems (diff) | |
| download | linux-ca7d98dbd7db6aa8bc4b08e26be1249436d21af3.tar.xz linux-ca7d98dbd7db6aa8bc4b08e26be1249436d21af3.zip | |
iio: Update iio_channel_get_all and iio_channel_get_all_cb API
Pass device pointer instead of device name as parameter to iio_channel_get_all
and iio_channel_get_all_cb. This will enable us to use OF information to
retrieve consumer channel information.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/buffer_cb.c | 4 | ||||
| -rw-r--r-- | drivers/iio/inkern.c | 6 | ||||
| -rw-r--r-- | drivers/staging/iio/iio_hwmon.c | 9 |
3 files changed, 12 insertions, 7 deletions
diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c index 4d40e24f3721..9201022945e9 100644 --- a/drivers/iio/buffer_cb.c +++ b/drivers/iio/buffer_cb.c @@ -25,7 +25,7 @@ static struct iio_buffer_access_funcs iio_cb_access = { .store_to = &iio_buffer_cb_store_to, }; -struct iio_cb_buffer *iio_channel_get_all_cb(const char *name, +struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, int (*cb)(u8 *data, void *private), void *private) @@ -46,7 +46,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(const char *name, cb_buff->buffer.access = &iio_cb_access; INIT_LIST_HEAD(&cb_buff->buffer.demux_list); - cb_buff->channels = iio_channel_get_all(name); + cb_buff->channels = iio_channel_get_all(dev); if (IS_ERR(cb_buff->channels)) { ret = PTR_ERR(cb_buff->channels); goto error_free_cb_buff; diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index d55e98fb300e..58d0ffe856b6 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -167,16 +167,18 @@ void iio_channel_release(struct iio_channel *channel) } EXPORT_SYMBOL_GPL(iio_channel_release); -struct iio_channel *iio_channel_get_all(const char *name) +struct iio_channel *iio_channel_get_all(struct device *dev) { + const char *name; struct iio_channel *chans; struct iio_map_internal *c = NULL; int nummaps = 0; int mapind = 0; int i, ret; - if (name == NULL) + if (dev == NULL) return ERR_PTR(-EINVAL); + name = dev_name(dev); mutex_lock(&iio_map_list_lock); /* first count the matching maps */ diff --git a/drivers/staging/iio/iio_hwmon.c b/drivers/staging/iio/iio_hwmon.c index d4ef34fe0341..93af756ba48c 100644 --- a/drivers/staging/iio/iio_hwmon.c +++ b/drivers/staging/iio/iio_hwmon.c @@ -71,14 +71,17 @@ static int iio_hwmon_probe(struct platform_device *pdev) int ret, i; int in_i = 1, temp_i = 1, curr_i = 1; enum iio_chan_type type; + struct iio_channel *channels; + + channels = iio_channel_get_all(dev); + if (IS_ERR(channels)) + return PTR_ERR(channels); st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL); if (st == NULL) return -ENOMEM; - st->channels = iio_channel_get_all(dev_name(dev)); - if (IS_ERR(st->channels)) - return PTR_ERR(st->channels); + st->channels = channels; /* count how many attributes we have */ while (st->channels[st->num_channels].indio_dev) |