bitbang->lock is now a mutex: replace spinlock function calls
by mutex functions.

Signed-off-by: Nicolas Boichat <drink...@chromium.org>
---
 drivers/spi/spi-s3c24xx.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index f36bc32..b1d03e5 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -198,12 +198,11 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
        if (ret)
                return ret;
 
-       spin_lock(&hw->bitbang.lock);
-       if (!hw->bitbang.busy) {
+       if (mutex_trylock(&hw->bitbang.lock)) {
                hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE);
                /* need to ndelay for 0.5 clocktick ? */
+               mutex_unlock(&hw->bitbang.lock);
        }
-       spin_unlock(&hw->bitbang.lock);
 
        return 0;
 }
-- 
2.5.0.rc2.392.g76e840b

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to