From 5c6564e46c5d0bf61aa32f2ad264881e5cb0b767 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Tue, 30 Aug 2011 12:41:13 +0100 Subject: [PATCH] --- yaml --- r: 268155 b: refs/heads/master c: 6446e9cd2c1658f0afe856dfbe0b4623db39fb46 h: refs/heads/master i: 268153: ea99a5aab92032a49aa76bb96bb07270c1cfbe5f 268151: aeea55cc18dcb7f7a3d2a756fdd77262dc732364 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/ring_generic.h | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f86f5639c99e..0ea99a55b9f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a25e5928e5ff7612087aab06c4130bf0ebe6592 +refs/heads/master: 6446e9cd2c1658f0afe856dfbe0b4623db39fb46 diff --git a/trunk/drivers/staging/iio/ring_generic.h b/trunk/drivers/staging/iio/ring_generic.h index a63a9cb81126..37ab4dbc0c84 100644 --- a/trunk/drivers/staging/iio/ring_generic.h +++ b/trunk/drivers/staging/iio/ring_generic.h @@ -65,6 +65,13 @@ struct iio_ring_access_funcs { int (*enable)(struct iio_ring_buffer *ring); }; +/** + * struct iio_ring_setup_ops - buffer setup related callbacks + * @preenable: [DRIVER] function to run prior to marking ring enabled + * @postenable: [DRIVER] function to run after marking ring enabled + * @predisable: [DRIVER] function to run prior to marking ring disabled + * @postdisable: [DRIVER] function to run after marking ring disabled + */ struct iio_ring_setup_ops { int (*preenable)(struct iio_dev *); int (*postenable)(struct iio_dev *); @@ -87,10 +94,6 @@ struct iio_ring_setup_ops { * @scan_timestamp: [INTERN] does the scan mode include a timestamp * @access: [DRIVER] ring access functions associated with the * implementation. - * @preenable: [DRIVER] function to run prior to marking ring enabled - * @postenable: [DRIVER] function to run after marking ring enabled - * @predisable: [DRIVER] function to run prior to marking ring disabled - * @postdisable: [DRIVER] function to run after marking ring disabled * @flags: [INTERN] file ops related flags including busy flag. **/ struct iio_ring_buffer {