Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354218
b: refs/heads/master
c: 61992d9
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Jonathan Cameron committed Jan 26, 2013
1 parent a606b67 commit cf624e6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 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: 3c80372dae17cb1a5a493c9ed02f7ca2a8d9ce53
refs/heads/master: 61992d993beb5af8c64c617ec474439079aa726d
5 changes: 0 additions & 5 deletions trunk/drivers/staging/iio/gyro/adis16080_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@
* struct adis16080_state - device instance specific data
* @us: actual spi_device to write data
* @buf: transmit or receive buffer
* @buf_lock: mutex to protect tx and rx
**/
struct adis16080_state {
struct spi_device *us;
struct mutex buf_lock;

__be16 buf ____cacheline_aligned;
};
Expand All @@ -59,7 +57,6 @@ static int adis16080_read_sample(struct iio_dev *indio_dev,
},
};

mutex_lock(&st->buf_lock);
st->buf = cpu_to_be16(addr | ADIS16080_DIN_WRITE);

spi_message_init(&m);
Expand All @@ -69,7 +66,6 @@ static int adis16080_read_sample(struct iio_dev *indio_dev,
ret = spi_sync(st->us, &m);
if (ret == 0)
*val = sign_extend32(be16_to_cpu(st->buf), 11);
mutex_unlock(&st->buf_lock);

return ret;
}
Expand Down Expand Up @@ -144,7 +140,6 @@ static int adis16080_probe(struct spi_device *spi)

/* Allocate the comms buffers */
st->us = spi;
mutex_init(&st->buf_lock);

indio_dev->name = spi->dev.driver->name;
indio_dev->channels = adis16080_channels;
Expand Down

0 comments on commit cf624e6

Please sign in to comment.