diff options
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spidev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 5d23983f02fc..20d7322e2f71 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/smp_lock.h> | ||
34 | 33 | ||
35 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/spidev.h> | 35 | #include <linux/spi/spidev.h> |
@@ -42,7 +41,7 @@ | |||
42 | * This supports acccess to SPI devices using normal userspace I/O calls. | 41 | * This supports acccess to SPI devices using normal userspace I/O calls. |
43 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, | 42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, |
44 | * and often mask message boundaries, full SPI support requires full duplex | 43 | * and often mask message boundaries, full SPI support requires full duplex |
45 | * transfers. There are several kinds of of internal message boundaries to | 44 | * transfers. There are several kinds of internal message boundaries to |
46 | * handle chipselect management and other protocol options. | 45 | * handle chipselect management and other protocol options. |
47 | * | 46 | * |
48 | * SPI has a character major number assigned. We allocate minor numbers | 47 | * SPI has a character major number assigned. We allocate minor numbers |
@@ -477,7 +476,6 @@ static int spidev_open(struct inode *inode, struct file *filp) | |||
477 | struct spidev_data *spidev; | 476 | struct spidev_data *spidev; |
478 | int status = -ENXIO; | 477 | int status = -ENXIO; |
479 | 478 | ||
480 | lock_kernel(); | ||
481 | mutex_lock(&device_list_lock); | 479 | mutex_lock(&device_list_lock); |
482 | 480 | ||
483 | list_for_each_entry(spidev, &device_list, device_entry) { | 481 | list_for_each_entry(spidev, &device_list, device_entry) { |
@@ -503,7 +501,6 @@ static int spidev_open(struct inode *inode, struct file *filp) | |||
503 | pr_debug("spidev: nothing for minor %d\n", iminor(inode)); | 501 | pr_debug("spidev: nothing for minor %d\n", iminor(inode)); |
504 | 502 | ||
505 | mutex_unlock(&device_list_lock); | 503 | mutex_unlock(&device_list_lock); |
506 | unlock_kernel(); | ||
507 | return status; | 504 | return status; |
508 | } | 505 | } |
509 | 506 | ||