From 7f9cd812cc2598b9d7597ab996f55dd5dba95990 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 9 May 2012 03:18:17 +0900 Subject: [PATCH] --- yaml --- r: 304553 b: refs/heads/master c: 99de0c2b341fc2d0f41ca9eadaa752c651c06b83 h: refs/heads/master i: 304551: eae1d7c320cd1a2e71513f2dac024ffadfaab9b7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/TODO | 2 +- trunk/drivers/staging/iio/gyro/adxrs450.h | 2 +- trunk/drivers/staging/iio/iio_simple_dummy_buffer.c | 4 ++-- trunk/drivers/staging/iio/iio_simple_dummy_events.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f58c7b4fb0c3..ae5c548e1930 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abd5a2fb3957b5a6eb8083044a61e1b95b770abf +refs/heads/master: 99de0c2b341fc2d0f41ca9eadaa752c651c06b83 diff --git a/trunk/drivers/staging/iio/TODO b/trunk/drivers/staging/iio/TODO index d1ad35e24abb..cf3f9489b9da 100644 --- a/trunk/drivers/staging/iio/TODO +++ b/trunk/drivers/staging/iio/TODO @@ -67,7 +67,7 @@ e-mailing the normal IIO list (see below). Documentation 1) Lots of cleanup and expansion. -2) Some device require indvidual docs. +2) Some device require individual docs. Contact: Jonathan Cameron . Mailing list: linux-iio@vger.kernel.org diff --git a/trunk/drivers/staging/iio/gyro/adxrs450.h b/trunk/drivers/staging/iio/gyro/adxrs450.h index af0c870100b6..f8cf21f02943 100644 --- a/trunk/drivers/staging/iio/gyro/adxrs450.h +++ b/trunk/drivers/staging/iio/gyro/adxrs450.h @@ -49,7 +49,7 @@ enum { * @us: actual spi_device * @buf_lock: mutex to protect tx and rx * @tx: transmit buffer - * @rx: recieve buffer + * @rx: receive buffer **/ struct adxrs450_state { struct spi_device *us; diff --git a/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c b/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c index 372606572d15..fdfc8739095a 100644 --- a/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c +++ b/trunk/drivers/staging/iio/iio_simple_dummy_buffer.c @@ -37,7 +37,7 @@ static const s16 fakedata[] = { * @irq: the interrupt number * @p: private data - always a pointer to the poll func. * - * This is the guts of buffered capture. On a trigger event occuring, + * This is the guts of buffered capture. On a trigger event occurring, * if the pollfunc is attached then this handler is called as a threaded * interrupt (and hence may sleep). It is responsible for grabbing data * from the device and pushing it into the associated buffer. @@ -61,7 +61,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p) * up a fast read. The capture will consist of all of them. * Hence we just call the grab data function and fill the * buffer without processing. - * sofware scans: can be considered to be random access + * software scans: can be considered to be random access * so efficient reading is just a case of minimal bus * transactions. * software culled hardware scans: diff --git a/trunk/drivers/staging/iio/iio_simple_dummy_events.c b/trunk/drivers/staging/iio/iio_simple_dummy_events.c index f85bd197ed31..317b77465db4 100644 --- a/trunk/drivers/staging/iio/iio_simple_dummy_events.c +++ b/trunk/drivers/staging/iio/iio_simple_dummy_events.c @@ -122,7 +122,7 @@ int iio_simple_dummy_write_event_value(struct iio_dev *indio_dev, * @private: pointer to device instance state. * * This handler is responsible for querying the device to find out what - * event occured and for then pushing that event towards userspace. + * event occurred and for then pushing that event towards userspace. * Here only one event occurs so we push that directly on with locally * grabbed timestamp. */