diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:40:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:06:12 -0700 |
| commit | 3feb07979c4d5b63d5e15ef01c97018a6d0db5b3 (patch) | |
| tree | 3c4851b70649d964f155ea849ce2f5c102bc8b48 /drivers/staging/iio/ring_generic.h | |
| parent | b9d40a9d5583a530372b4e1888e4f643ed05aca6 (diff) | |
| download | op-kernel-dev-3feb07979c4d5b63d5e15ef01c97018a6d0db5b3.zip op-kernel-dev-3feb07979c4d5b63d5e15ef01c97018a6d0db5b3.tar.gz | |
staging:iio: Buffer device flattening.
Given we now only have one device we don't need the extra layer any more.
Hence this patch removes it.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/ring_generic.h')
| -rw-r--r-- | drivers/staging/iio/ring_generic.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 3a1a872..91f1037 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -68,11 +68,9 @@ struct iio_ring_access_funcs { /** * struct iio_ring_buffer - general ring buffer structure * @dev: ring buffer device struct - * @access_dev: system device struct for the chrdev * @indio_dev: industrial I/O device structure * @owner: module that owns the ring buffer (for ref counting) * @id: unique id number - * @access_id: device id number * @length: [DEVICE] number of datums in ring * @bytes_per_datum: [DEVICE] size of individual datum including timestamp * @bpe: [DEVICE] size of individual channel value @@ -92,11 +90,9 @@ struct iio_ring_access_funcs { **/ struct iio_ring_buffer { struct device dev; - struct device access_dev; struct iio_dev *indio_dev; struct module *owner; int id; - int access_id; int length; int bytes_per_datum; int bpe; @@ -398,8 +394,6 @@ static inline void iio_put_ring_buffer(struct iio_ring_buffer *ring) #define to_iio_ring_buffer(d) \ container_of(d, struct iio_ring_buffer, dev) -#define access_dev_to_iio_ring_buffer(d) \ - container_of(d, struct iio_ring_buffer, access_dev) /** * iio_ring_buffer_register() - register the buffer with IIO core @@ -416,6 +410,8 @@ int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, int id, const struct iio_chan_spec *channels, int num_channels); +void iio_ring_access_release(struct device *dev); + /** * iio_ring_buffer_unregister() - unregister the buffer from IIO core * @ring: the buffer to be unregistered |
