Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317390
b: refs/heads/master
c: 25c38aa
h: refs/heads/master
v: v3
  • Loading branch information
Peter Meerwald authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent 33de1f6 commit fda1808
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07a8329c48b699a85086756eaa1a658540d02ac4
refs/heads/master: 25c38aa3d17d6ccfca225fafce68401908a1ccb4
10 changes: 5 additions & 5 deletions trunk/drivers/staging/iio/iio_simple_dummy.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/*
* A few elements needed to fake a bus for this driver
* Note instances parmeter controls how many of these
* Note instances parameter controls how many of these
* dummy devices are registered.
*/
static unsigned instances = 1;
Expand Down Expand Up @@ -178,7 +178,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
.scan_index = accelx,
.scan_type = { /* Description of storage in buffer */
.sign = 's', /* signed */
.realbits = 16, /* 12 bits */
.realbits = 16, /* 16 bits */
.storagebits = 16, /* 16 bits used for storage */
.shift = 0, /* zero shift */
},
Expand Down Expand Up @@ -285,9 +285,9 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev,
* iio_dummy_write_raw() - data write function.
* @indio_dev: the struct iio_dev associated with this device instance
* @chan: the channel whose data is to be read
* @val: first element of returned value (typically INT)
* @val2: second element of returned value (typically MICRO)
* @mask: what we actually want to read. 0 is the channel, everything else
* @val: first element of value to set (typically INT)
* @val2: second element of value to set (typically MICRO)
* @mask: what we actually want to write. 0 is the channel, everything else
* is as per the info_mask in iio_chan_spec.
*
* Note that all raw writes are assumed IIO_VAL_INT and info mask elements
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/iio_simple_dummy_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
* software culled hardware scans:
* occasionally a driver may process the nearest hardware
* scan to avoid storing elements that are not desired. This
* is the fidliest option by far.
* Here lets pretend we have random access. And the values are
* is the fiddliest option by far.
* Here let's pretend we have random access. And the values are
* in the constant table fakedata.
*/
int i, j;
Expand Down

0 comments on commit fda1808

Please sign in to comment.