Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 13 insertions, 16 deletions

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 5d23983f02fc..ea1bec3c9a13 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spidev.h>
@@ -42,7 +41,7 @@
  * This supports acccess to SPI devices using normal userspace I/O calls.
  * Note that while traditional UNIX/POSIX I/O semantics are half duplex,
  * and often mask message boundaries, full SPI support requires full duplex
- * transfers.  There are several kinds of of internal message boundaries to
+ * transfers.  There are several kinds of internal message boundaries to
  * handle chipselect management and other protocol options.
  *
  * SPI has a character major number assigned.  We allocate minor numbers
@@ -54,7 +53,7 @@
 #define SPIDEV_MAJOR                    153     /* assigned */
 #define N_SPI_MINORS                    32      /* ... up to 256 */
 
-static unsigned long    minors[N_SPI_MINORS / BITS_PER_LONG];
+static DECLARE_BITMAP(minors, N_SPI_MINORS);
 
 
 /* Bit masks for spi_device.mode management.  Note that incorrect
@@ -267,15 +266,15 @@ static int spidev_message(struct spidev_data *spidev,
                 k_tmp->delay_usecs = u_tmp->delay_usecs;
                 k_tmp->speed_hz = u_tmp->speed_hz;
 #ifdef VERBOSE
-                dev_dbg(&spi->dev,
+                dev_dbg(&spidev->spi->dev,
                         "  xfer len %zd %s%s%s%dbits %u usec %uHz\n",
                         u_tmp->len,
                         u_tmp->rx_buf ? "rx " : "",
                         u_tmp->tx_buf ? "tx " : "",
                         u_tmp->cs_change ? "cs " : "",
-                        u_tmp->bits_per_word ? : spi->bits_per_word,
+                        u_tmp->bits_per_word ? : spidev->spi->bits_per_word,
                         u_tmp->delay_usecs,
-                        u_tmp->speed_hz ? : spi->max_speed_hz);
+                        u_tmp->speed_hz ? : spidev->spi->max_speed_hz);
 #endif
                 spi_message_add_tail(k_tmp, &msg);
         }
@@ -477,7 +476,6 @@ static int spidev_open(struct inode *inode, struct file *filp)
         struct spidev_data      *spidev;
         int                     status = -ENXIO;
 
-        lock_kernel();
         mutex_lock(&device_list_lock);
 
         list_for_each_entry(spidev, &device_list, device_entry) {
@@ -503,7 +501,6 @@ static int spidev_open(struct inode *inode, struct file *filp)
                 pr_debug("spidev: nothing for minor %d\n", iminor(inode));
 
         mutex_unlock(&device_list_lock);
-        unlock_kernel();
         return status;
 }
 
@@ -561,7 +558,7 @@ static struct class *spidev_class;
 
 /*-------------------------------------------------------------------------*/
 
-static int spidev_probe(struct spi_device *spi)
+static int __devinit spidev_probe(struct spi_device *spi)
 {
         struct spidev_data      *spidev;
         int                     status;
@@ -610,7 +607,7 @@ static int spidev_probe(struct spi_device *spi)
         return status;
 }
 
-static int spidev_remove(struct spi_device *spi)
+static int __devexit spidev_remove(struct spi_device *spi)
 {
         struct spidev_data      *spidev = spi_get_drvdata(spi);
 
@@ -632,7 +629,7 @@ static int spidev_remove(struct spi_device *spi)
         return 0;
 }
 
-static struct spi_driver spidev_spi = {
+static struct spi_driver spidev_spi_driver = {
         .driver = {
                 .name =         "spidev",
                 .owner =        THIS_MODULE,
@@ -664,14 +661,14 @@ static int __init spidev_init(void)
 
         spidev_class = class_create(THIS_MODULE, "spidev");
         if (IS_ERR(spidev_class)) {
-                unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+                unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);
                 return PTR_ERR(spidev_class);
         }
 
-        status = spi_register_driver(&spidev_spi);
+        status = spi_register_driver(&spidev_spi_driver);
         if (status < 0) {
                 class_destroy(spidev_class);
-                unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+                unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);
         }
         return status;
 }
@@ -679,9 +676,9 @@ module_init(spidev_init);
 
 static void __exit spidev_exit(void)
 {
-        spi_unregister_driver(&spidev_spi);
+        spi_unregister_driver(&spidev_spi_driver);
         class_destroy(spidev_class);
-        unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);
+        unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);
 }
 module_exit(spidev_exit);