From 65cfc366ac7a359b51f54173bce730b6fc97c560 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Tue, 30 Aug 2011 12:41:12 +0100
Subject: [PATCH] --- yaml --- r: 268154 b: refs/heads/master c:
 1a25e5928e5ff7612087aab06c4130bf0ebe6592 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/staging/iio/iio.h | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d93f790f76ad..f86f5639c99e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e8dfcc6c3d36dabc77925104fc5769f79340be5
+refs/heads/master: 1a25e5928e5ff7612087aab06c4130bf0ebe6592
diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h
index 1c24d1389251..36a826e6e65a 100644
--- a/trunk/drivers/staging/iio/iio.h
+++ b/trunk/drivers/staging/iio/iio.h
@@ -265,8 +265,10 @@ struct iio_info {
  * @channels:		[DRIVER] channel specification structure table
  * @num_channels:	[DRIVER] number of chanels specified in @channels.
  * @channel_attr_list:	[INTERN] keep track of automatically created channel
- *			attributes.
+ *			attributes
  * @name:		[DRIVER] name of the device.
+ * @info:		[DRIVER] callbacks and constant info from driver
+ * @chrdev:		[INTERN] associated character device
  **/
 struct iio_dev {
 	int				id;
@@ -284,13 +286,13 @@ struct iio_dev {
 	struct iio_trigger		*trig;
 	struct iio_poll_func		*pollfunc;
 
-	struct iio_chan_spec const *channels;
-	int num_channels;
+	struct iio_chan_spec const	*channels;
+	int				num_channels;
 
-	struct list_head channel_attr_list;
-	const char *name;
-	const struct iio_info *info;
-	struct cdev				chrdev;
+	struct list_head		channel_attr_list;
+	const char			*name;
+	const struct iio_info		*info;
+	struct cdev			chrdev;
 };
 
 /**
@@ -308,11 +310,10 @@ void iio_device_unregister(struct iio_dev *dev_info);
 /**
  * iio_push_event() - try to add event to the list for userspace reading
  * @dev_info:		IIO device structure
- * @ev_line:		Which event line (hardware interrupt)
  * @ev_code:		What event
  * @timestamp:		When the event occurred
  **/
-int iio_push_event(struct iio_dev *dev_info, int ev_code,  s64 timestamp);
+int iio_push_event(struct iio_dev *dev_info, int ev_code, s64 timestamp);
 
 extern struct bus_type iio_bus_type;