From cf624e69d22bfaed5d85b432a19f93036f0902c2 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 9 Jan 2013 14:01:00 +0000 Subject: [PATCH] --- yaml --- r: 354218 b: refs/heads/master c: 61992d993beb5af8c64c617ec474439079aa726d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/gyro/adis16080_core.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6b06fe43a5d2..e1847cb266be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c80372dae17cb1a5a493c9ed02f7ca2a8d9ce53 +refs/heads/master: 61992d993beb5af8c64c617ec474439079aa726d diff --git a/trunk/drivers/staging/iio/gyro/adis16080_core.c b/trunk/drivers/staging/iio/gyro/adis16080_core.c index d033b6f486a6..76764ba16719 100644 --- a/trunk/drivers/staging/iio/gyro/adis16080_core.c +++ b/trunk/drivers/staging/iio/gyro/adis16080_core.c @@ -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; }; @@ -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); @@ -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; } @@ -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;