vserver 1.9.5.x5

[linux-2.6.git] / drivers / pcmcia / i82092.c

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 69125c3..a34632d 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -81,7 +81,7 @@ struct socket_info {
                                    1 = empty socket, 
                                    2 = card but not initialized,
                                    3 = operational card */
-       int     io_base;        /* base io address of the socket */
+       kio_addr_t io_base;     /* base io address of the socket */
        
        struct pcmcia_socket socket;
        struct pci_dev *dev;    /* The PCI device for the socket */
@@ -122,7 +122,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
        }
        printk(KERN_INFO "i82092aa: configured as a %d socket device.\n", socket_count);
 
-       if (request_region(pci_resource_start(dev, 0), 2, "i82092aa")) {
+       if (!request_region(pci_resource_start(dev, 0), 2, "i82092aa")) {
                ret = -EBUSY;
                goto err_out_disable;
        }
@@ -162,6 +162,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
        for (i = 0; i<socket_count; i++) {
                sockets[i].socket.dev.dev = &dev->dev;
                sockets[i].socket.ops = &i82092aa_operations;
+               sockets[i].socket.resource_ops = &pccard_nonstatic_ops;
                ret = pcmcia_register_socket(&sockets[i].socket);
                if (ret) {
                        goto err_out_free_sockets;
@@ -199,7 +200,7 @@ static void __devexit i82092aa_pci_remove(struct pci_dev *dev)
        leave("i82092aa_pci_remove");
 }
 
-static spinlock_t port_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(port_lock);
 
 /* basic value read/write functions */
 
@@ -420,12 +421,12 @@ static void set_bridge_state(int sock)
 static int i82092aa_init(struct pcmcia_socket *sock)
 {
        int i;
+       struct resource res = { .start = 0, .end = 0x0fff };
         pccard_io_map io = { 0, 0, 0, 0, 1 };
-        pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 };
+       pccard_mem_map mem = { .res = &res, };
         
         enter("i82092aa_init");
                         
-        mem.sys_stop = 0x0fff;
         for (i = 0; i < 2; i++) {
                io.map = i;
                 i82092aa_set_io_map(sock, &io);
@@ -706,11 +707,15 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_ma
 
 static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_map *mem)
 {
-       unsigned int sock = container_of(socket, struct socket_info, socket)->number;
+       struct socket_info *sock_info = container_of(socket, struct socket_info, socket);
+       unsigned int sock = sock_info->number;
+       struct pci_bus_region region;
        unsigned short base, i;
        unsigned char map;
        
        enter("i82092aa_set_mem_map");
+
+       pcibios_resource_to_bus(sock_info->dev, &region, mem->res);
        
        map = mem->map;
        if (map > 4) {
@@ -719,10 +724,10 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
        }
        
        
-       if ( (mem->card_start > 0x3ffffff) || (mem->sys_start > mem->sys_stop) ||
+       if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
             (mem->speed > 1000) ) {
                leave("i82092aa_set_mem_map: invalid address / speed");
-               printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,mem->sys_start, mem->sys_stop, mem->card_start);
+               printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
                return -EINVAL;
        }
        
@@ -731,11 +736,11 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
                      indirect_resetbit(sock, I365_ADDRWIN, I365_ENA_MEM(map));
                         
                         
-/*     printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i \n",map, mem->sys_start,mem->sys_stop,sock,mem->speed,mem->flags & MAP_ACTIVE);  */
+/*     printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i \n",map, region.start,region.end,sock,mem->speed,mem->flags & MAP_ACTIVE);  */
 
        /* write the start address */
        base = I365_MEM(map);
-       i = (mem->sys_start >> 12) & 0x0fff;
+       i = (region.start >> 12) & 0x0fff;
        if (mem->flags & MAP_16BIT) 
                i |= I365_MEM_16BIT;
        if (mem->flags & MAP_0WS)
@@ -744,7 +749,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
                               
        /* write the stop address */
        
-       i= (mem->sys_stop >> 12) & 0x0fff;
+       i= (region.end >> 12) & 0x0fff;
        switch (to_cycles(mem->speed)) {
                case 0:
                        break;
@@ -763,7 +768,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
        
        /* card start */
        
-       i = ((mem->card_start - mem->sys_start) >> 12) & 0x3fff;
+       i = ((mem->card_start - region.start) >> 12) & 0x3fff;
        if (mem->flags & MAP_WRPROT)
                i |= I365_MEM_WRPROT;
        if (mem->flags & MAP_ATTRIB) {