Commit adca058b authored by Matt Ranostay's avatar Matt Ranostay Committed by Jonathan Cameron

iio: buffer-callback: allow getting underlying iio_dev

Add iio_channel_cb_get_iio_dev function to allow getting the
underlying iio_dev. This is useful for setting the trigger of the
consumer ADC device.
Signed-off-by: default avatarMatt Ranostay <mranostay@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent a4fa6509
...@@ -18,6 +18,7 @@ struct iio_cb_buffer { ...@@ -18,6 +18,7 @@ struct iio_cb_buffer {
int (*cb)(const void *data, void *private); int (*cb)(const void *data, void *private);
void *private; void *private;
struct iio_channel *channels; struct iio_channel *channels;
struct iio_dev *indio_dev;
}; };
static struct iio_cb_buffer *buffer_to_cb_buffer(struct iio_buffer *buffer) static struct iio_cb_buffer *buffer_to_cb_buffer(struct iio_buffer *buffer)
...@@ -52,7 +53,6 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, ...@@ -52,7 +53,6 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
{ {
int ret; int ret;
struct iio_cb_buffer *cb_buff; struct iio_cb_buffer *cb_buff;
struct iio_dev *indio_dev;
struct iio_channel *chan; struct iio_channel *chan;
cb_buff = kzalloc(sizeof(*cb_buff), GFP_KERNEL); cb_buff = kzalloc(sizeof(*cb_buff), GFP_KERNEL);
...@@ -72,17 +72,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, ...@@ -72,17 +72,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
goto error_free_cb_buff; goto error_free_cb_buff;
} }
indio_dev = cb_buff->channels[0].indio_dev; cb_buff->indio_dev = cb_buff->channels[0].indio_dev;
cb_buff->buffer.scan_mask cb_buff->buffer.scan_mask
= kcalloc(BITS_TO_LONGS(indio_dev->masklength), sizeof(long), = kcalloc(BITS_TO_LONGS(cb_buff->indio_dev->masklength),
GFP_KERNEL); sizeof(long), GFP_KERNEL);
if (cb_buff->buffer.scan_mask == NULL) { if (cb_buff->buffer.scan_mask == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_release_channels; goto error_release_channels;
} }
chan = &cb_buff->channels[0]; chan = &cb_buff->channels[0];
while (chan->indio_dev) { while (chan->indio_dev) {
if (chan->indio_dev != indio_dev) { if (chan->indio_dev != cb_buff->indio_dev) {
ret = -EINVAL; ret = -EINVAL;
goto error_free_scan_mask; goto error_free_scan_mask;
} }
...@@ -105,17 +105,14 @@ EXPORT_SYMBOL_GPL(iio_channel_get_all_cb); ...@@ -105,17 +105,14 @@ EXPORT_SYMBOL_GPL(iio_channel_get_all_cb);
int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff) int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff)
{ {
return iio_update_buffers(cb_buff->channels[0].indio_dev, return iio_update_buffers(cb_buff->indio_dev, &cb_buff->buffer,
&cb_buff->buffer,
NULL); NULL);
} }
EXPORT_SYMBOL_GPL(iio_channel_start_all_cb); EXPORT_SYMBOL_GPL(iio_channel_start_all_cb);
void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff) void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff)
{ {
iio_update_buffers(cb_buff->channels[0].indio_dev, iio_update_buffers(cb_buff->indio_dev, NULL, &cb_buff->buffer);
NULL,
&cb_buff->buffer);
} }
EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb); EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb);
...@@ -133,6 +130,13 @@ struct iio_channel ...@@ -133,6 +130,13 @@ struct iio_channel
} }
EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels); EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels);
struct iio_dev
*iio_channel_cb_get_iio_dev(const struct iio_cb_buffer *cb_buffer)
{
return cb_buffer->indio_dev;
}
EXPORT_SYMBOL_GPL(iio_channel_cb_get_iio_dev);
MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>"); MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
MODULE_DESCRIPTION("Industrial I/O callback buffer"); MODULE_DESCRIPTION("Industrial I/O callback buffer");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -164,6 +164,18 @@ void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff); ...@@ -164,6 +164,18 @@ void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff);
struct iio_channel struct iio_channel
*iio_channel_cb_get_channels(const struct iio_cb_buffer *cb_buffer); *iio_channel_cb_get_channels(const struct iio_cb_buffer *cb_buffer);
/**
* iio_channel_cb_get_iio_dev() - get access to the underlying device.
* @cb_buffer: The callback buffer from whom we want the device
* information.
*
* This function allows one to obtain information about the device.
* The primary aim is to allow drivers that are consuming a device to query
* things like current trigger.
*/
struct iio_dev
*iio_channel_cb_get_iio_dev(const struct iio_cb_buffer *cb_buffer);
/** /**
* iio_read_channel_raw() - read from a given channel * iio_read_channel_raw() - read from a given channel
* @chan: The channel being queried. * @chan: The channel being queried.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment