Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[linux-2.6.git] / drivers / spi / spidev.c

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 9c446e6003d5c16bae4b9b7c5cb589411bc79770..ea1bec3c9a13359a4058a762e9f2f8de7755cc36 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -53,7 +53,7 @@
 #define SPIDEV_MAJOR                   153     /* assigned */
 #define N_SPI_MINORS                   32      /* ... up to 256 */
 
 #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
 
 
 /* Bit masks for spi_device.mode management.  Note that incorrect


@@ -558,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;
 {
        struct spidev_data      *spidev;
        int                     status;


@@ -607,7 +607,7 @@ static int spidev_probe(struct spi_device *spi)
        return status;
 }
 
        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);
 
 {
        struct spidev_data      *spidev = spi_get_drvdata(spi);
 


@@ -629,7 +629,7 @@ static int spidev_remove(struct spi_device *spi)
        return 0;
 }
 
        return 0;
 }
 

-static struct spi_driver spidev_spi = {
+static struct spi_driver spidev_spi_driver = {

        .driver = {
                .name =         "spidev",
                .owner =        THIS_MODULE,
        .driver = {
                .name =         "spidev",
                .owner =        THIS_MODULE,


@@ -661,14 +661,14 @@ static int __init spidev_init(void)
 
        spidev_class = class_create(THIS_MODULE, "spidev");
        if (IS_ERR(spidev_class)) {
 
        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);
        }
 
                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);
        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;
 }
        }
        return status;
 }


@@ -676,9 +676,9 @@ module_init(spidev_init);
 
 static void __exit spidev_exit(void)
 {
 
 static void __exit spidev_exit(void)
 {

-       spi_unregister_driver(&spidev_spi);
+       spi_unregister_driver(&spidev_spi_driver);

        class_destroy(spidev_class);
        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);
 
 }
 module_exit(spidev_exit);