diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-01-31 16:43:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-02-02 06:58:46 -0500 |
commit | ca7d98dbd7db6aa8bc4b08e26be1249436d21af3 (patch) | |
tree | b0a094e0a28b62adace30b549a550305064a72d7 /include/linux/iio | |
parent | 482bb4e6c648a68598cde9d4a56b066df26d5ae6 (diff) |
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 'include/linux/iio')
-rw-r--r-- | include/linux/iio/consumer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index 16c35ac045bd..a85787ac66ab 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | struct iio_dev; | 16 | struct iio_dev; |
17 | struct iio_chan_spec; | 17 | struct iio_chan_spec; |
18 | struct device; | ||
18 | 19 | ||
19 | /** | 20 | /** |
20 | * struct iio_channel - everything needed for a consumer to use a channel | 21 | * struct iio_channel - everything needed for a consumer to use a channel |
@@ -48,14 +49,14 @@ void iio_channel_release(struct iio_channel *chan); | |||
48 | 49 | ||
49 | /** | 50 | /** |
50 | * iio_channel_get_all() - get all channels associated with a client | 51 | * iio_channel_get_all() - get all channels associated with a client |
51 | * @name: name of consumer device. | 52 | * @dev: Pointer to consumer device. |
52 | * | 53 | * |
53 | * Returns an array of iio_channel structures terminated with one with | 54 | * Returns an array of iio_channel structures terminated with one with |
54 | * null iio_dev pointer. | 55 | * null iio_dev pointer. |
55 | * This function is used by fairly generic consumers to get all the | 56 | * This function is used by fairly generic consumers to get all the |
56 | * channels registered as having this consumer. | 57 | * channels registered as having this consumer. |
57 | */ | 58 | */ |
58 | struct iio_channel *iio_channel_get_all(const char *name); | 59 | struct iio_channel *iio_channel_get_all(struct device *dev); |
59 | 60 | ||
60 | /** | 61 | /** |
61 | * iio_channel_release_all() - reverse iio_channel_get_all | 62 | * iio_channel_release_all() - reverse iio_channel_get_all |
@@ -66,7 +67,7 @@ void iio_channel_release_all(struct iio_channel *chan); | |||
66 | struct iio_cb_buffer; | 67 | struct iio_cb_buffer; |
67 | /** | 68 | /** |
68 | * iio_channel_get_all_cb() - register callback for triggered capture | 69 | * iio_channel_get_all_cb() - register callback for triggered capture |
69 | * @name: Name of client device. | 70 | * @dev: Pointer to client device. |
70 | * @cb: Callback function. | 71 | * @cb: Callback function. |
71 | * @private: Private data passed to callback. | 72 | * @private: Private data passed to callback. |
72 | * | 73 | * |
@@ -74,7 +75,7 @@ struct iio_cb_buffer; | |||
74 | * So if the channels requested come from different devices this will | 75 | * So if the channels requested come from different devices this will |
75 | * fail. | 76 | * fail. |
76 | */ | 77 | */ |
77 | struct iio_cb_buffer *iio_channel_get_all_cb(const char *name, | 78 | struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, |
78 | int (*cb)(u8 *data, | 79 | int (*cb)(u8 *data, |
79 | void *private), | 80 | void *private), |
80 | void *private); | 81 | void *private); |