vserver 1.9.5.x5

[linux-2.6.git] / drivers / mtd / maps / sbc_gxx.c

diff --git a/drivers/mtd/maps/sbc_gxx.c b/drivers/mtd/maps/sbc_gxx.c
index 7a9cb1d..65add28 100644 (file)
--- a/drivers/mtd/maps/sbc_gxx.c
+++ b/drivers/mtd/maps/sbc_gxx.c
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-   $Id: sbc_gxx.c,v 1.29 2004/07/12 22:38:29 dwmw2 Exp $
+   $Id: sbc_gxx.c,v 1.33 2004/11/28 09:40:40 dwmw2 Exp $
 
 The SBC-MediaGX / SBC-GXx has up to 16 MiB of 
 Intel StrataFlash (28F320/28F640) in x8 mode.  
@@ -84,8 +84,8 @@ separate MTD devices.
 // Globals
 
 static volatile int page_in_window = -1; // Current page in window.
-static unsigned long iomapadr;
-static spinlock_t sbc_gxx_spin = SPIN_LOCK_UNLOCKED;
+static void __iomem *iomapadr;
+static DEFINE_SPINLOCK(sbc_gxx_spin);
 
 /* partition_info gives details on the logical partitions that the split the 
  * single flash device into. If the size if zero we use up to the end of the
@@ -189,13 +189,13 @@ static void cleanup_sbc_gxx(void)
                map_destroy( all_mtd );
        }
 
-       iounmap((void *)iomapadr);
+       iounmap(iomapadr);
        release_region(PAGE_IO,PAGE_IO_SIZE);
 }
 
-int __init init_sbc_gxx(void)
+static int __init init_sbc_gxx(void)
 {
-       iomapadr = (unsigned long)ioremap(WINDOW_START, WINDOW_LENGTH);
+       iomapadr = ioremap(WINDOW_START, WINDOW_LENGTH);
        if (!iomapadr) {
                printk( KERN_ERR"%s: failed to ioremap memory region\n",
                        sbc_gxx_map.name );
@@ -206,7 +206,7 @@ int __init init_sbc_gxx(void)
                printk( KERN_ERR"%s: IO ports 0x%x-0x%x in use\n",
                        sbc_gxx_map.name,
                        PAGE_IO, PAGE_IO+PAGE_IO_SIZE-1 );
-               iounmap((void *)iomapadr);
+               iounmap(iomapadr);
                return -EAGAIN;
        }