34 files changed, 1118 insertions, 1372 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 06e682334c7e..3ad7589d6a1c 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1,6 +1,6 @@
 /* myri_sbus.c: MyriCOM MyriNET SBUS card driver.
 *
- * Copyright (C) 1996, 1999, 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 1996, 1999, 2006, 2008 David S. Miller (davem@davemloft.net)
 */
 static char version[] =
@@ -22,6 +22,9 @@ static char version[] =
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <net/dst.h>
 #include <net/arp.h>
@@ -33,7 +36,6 @@ static char version[] =
 #include <asm/dma.h>
 #include <asm/byteorder.h>
 #include <asm/idprom.h>
-#include <asm/sbus.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/auxio.h>
@@ -243,7 +245,8 @@ static void myri_clean_rings(struct myri_eth *mp)
                        u32 dma_addr;
                        dma_addr = sbus_readl(&rxd->myri_scatters[0].addr);
-                        sbus_unmap_single(mp->myri_sdev, dma_addr, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);
+                        dma_unmap_single(&mp->myri_op->dev, dma_addr,
+                                         RX_ALLOC_SIZE, DMA_FROM_DEVICE);
                        dev_kfree_skb(mp->rx_skbs[i]);
                        mp->rx_skbs[i] = NULL;
                }
@@ -259,7 +262,9 @@ static void myri_clean_rings(struct myri_eth *mp)
                        u32 dma_addr;
                        dma_addr = sbus_readl(&txd->myri_gathers[0].addr);
-                        sbus_unmap_single(mp->myri_sdev, dma_addr, (skb->len + 3) & ~3, SBUS_DMA_TODEVICE);
+                        dma_unmap_single(&mp->myri_op->dev, dma_addr,
+                                         (skb->len + 3) & ~3,
+                                         DMA_TO_DEVICE);
                        dev_kfree_skb(mp->tx_skbs[i]);
                        mp->tx_skbs[i] = NULL;
                }
@@ -288,7 +293,9 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq)
                skb->dev = dev;
                skb_put(skb, RX_ALLOC_SIZE);
-                dma_addr = sbus_map_single(mp->myri_sdev, skb->data, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);
+                dma_addr = dma_map_single(&mp->myri_op->dev,
+                                          skb->data, RX_ALLOC_SIZE,
+                                          DMA_FROM_DEVICE);
                sbus_writel(dma_addr, &rxd[i].myri_scatters[0].addr);
                sbus_writel(RX_ALLOC_SIZE, &rxd[i].myri_scatters[0].len);
                sbus_writel(i, &rxd[i].ctx);
@@ -344,7 +351,8 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev)
                DTX(("SKB[%d] ", entry));
                dma_addr = sbus_readl(&sq->myri_txd[entry].myri_gathers[0].addr);
-                sbus_unmap_single(mp->myri_sdev, dma_addr, skb->len, SBUS_DMA_TODEVICE);
+                dma_unmap_single(&mp->myri_op->dev, dma_addr,
+                                 skb->len, DMA_TO_DEVICE);
                dev_kfree_skb(skb);
                mp->tx_skbs[entry] = NULL;
                dev->stats.tx_packets++;
@@ -423,9 +431,9 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
                /* Check for errors. */
                DRX(("rxd[%d]: %p len[%d] csum[%08x] ", entry, rxd, len, csum));
-                sbus_dma_sync_single_for_cpu(mp->myri_sdev,
+                dma_sync_single_for_cpu(&mp->myri_op->dev,
-                                             sbus_readl(&rxd->myri_scatters[0].addr),
+                                        sbus_readl(&rxd->myri_scatters[0].addr),
-                                             RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);
+                                        RX_ALLOC_SIZE, DMA_FROM_DEVICE);
                if (len < (ETH_HLEN + MYRI_PAD_LEN) || (skb->data[0] != MYRI_PAD_LEN)) {
                        DRX(("ERROR["));
                        dev->stats.rx_errors++;
@@ -442,10 +450,10 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
                        drops++;
                        DRX(("DROP "));
                        dev->stats.rx_dropped++;
-                        sbus_dma_sync_single_for_device(mp->myri_sdev,
+                        dma_sync_single_for_device(&mp->myri_op->dev,
-                                                        sbus_readl(&rxd->myri_scatters[0].addr),
+                                                   sbus_readl(&rxd->myri_scatters[0].addr),
-                                                        RX_ALLOC_SIZE,
+                                                   RX_ALLOC_SIZE,
-                                                        SBUS_DMA_FROMDEVICE);
+                                                   DMA_FROM_DEVICE);
                        sbus_writel(RX_ALLOC_SIZE, &rxd->myri_scatters[0].len);
                        sbus_writel(index, &rxd->ctx);
                        sbus_writel(1, &rxd->num_sg);
@@ -464,17 +472,17 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
                                DRX(("skb_alloc(FAILED) "));
                                goto drop_it;
                        }
-                        sbus_unmap_single(mp->myri_sdev,
+                        dma_unmap_single(&mp->myri_op->dev,
-                                          sbus_readl(&rxd->myri_scatters[0].addr),
+                                         sbus_readl(&rxd->myri_scatters[0].addr),
-                                          RX_ALLOC_SIZE,
+                                         RX_ALLOC_SIZE,
-                                          SBUS_DMA_FROMDEVICE);
+                                         DMA_FROM_DEVICE);
                        mp->rx_skbs[index] = new_skb;
                        new_skb->dev = dev;
                        skb_put(new_skb, RX_ALLOC_SIZE);
-                        dma_addr = sbus_map_single(mp->myri_sdev,
+                        dma_addr = dma_map_single(&mp->myri_op->dev,
-                                                   new_skb->data,
+                                                  new_skb->data,
-                                                   RX_ALLOC_SIZE,
+                                                  RX_ALLOC_SIZE,
-                                                   SBUS_DMA_FROMDEVICE);
+                                                  DMA_FROM_DEVICE);
                        sbus_writel(dma_addr, &rxd->myri_scatters[0].addr);
                        sbus_writel(RX_ALLOC_SIZE, &rxd->myri_scatters[0].len);
                        sbus_writel(index, &rxd->ctx);
@@ -500,10 +508,10 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
                        /* Reuse original ring buffer. */
                        DRX(("reuse "));
-                        sbus_dma_sync_single_for_device(mp->myri_sdev,
+                        dma_sync_single_for_device(&mp->myri_op->dev,
-                                                        sbus_readl(&rxd->myri_scatters[0].addr),
+                                                   sbus_readl(&rxd->myri_scatters[0].addr),
-                                                        RX_ALLOC_SIZE,
+                                                   RX_ALLOC_SIZE,
-                                                        SBUS_DMA_FROMDEVICE);
+                                                   DMA_FROM_DEVICE);
                        sbus_writel(RX_ALLOC_SIZE, &rxd->myri_scatters[0].len);
                        sbus_writel(index, &rxd->ctx);
                        sbus_writel(1, &rxd->num_sg);
@@ -652,7 +660,8 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
                sbus_writew((skb->data[4] << 8) | skb->data[5], &txd->addr[3]);
        }
-        dma_addr = sbus_map_single(mp->myri_sdev, skb->data, len, SBUS_DMA_TODEVICE);
+        dma_addr = dma_map_single(&mp->myri_op->dev, skb->data,
+                                  len, DMA_TO_DEVICE);
        sbus_writel(dma_addr, &txd->myri_gathers[0].addr);
        sbus_writel(len, &txd->myri_gathers[0].len);
        sbus_writel(1, &txd->num_sg);
@@ -891,30 +900,30 @@ static const struct header_ops myri_header_ops = {
        .cache_update   = myri_header_cache_update,
 };
-static int __devinit myri_ether_init(struct sbus_dev *sdev)
+static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        static int num;
+        struct device_node *dp = op->node;
        static unsigned version_printed;
        struct net_device *dev;
-        struct myri_eth *mp;
-        unsigned char prop_buf[32];
-        int i;
        DECLARE_MAC_BUF(mac);
+        struct myri_eth *mp;
+        const void *prop;
+        static int num;
+        int i, len;
-        DET(("myri_ether_init(%p,%d):\n", sdev, num));
+        DET(("myri_ether_init(%p,%d):\n", op, num));
        dev = alloc_etherdev(sizeof(struct myri_eth));
        if (!dev)
                return -ENOMEM;
        if (version_printed++ == 0)
                printk(version);
-        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
+        SET_NETDEV_DEV(dev, &op->dev);
-        mp = (struct myri_eth *) dev->priv;
+        mp = netdev_priv(dev);
        spin_lock_init(&mp->irq_lock);
-        mp->myri_sdev = sdev;
+        mp->myri_op = op;
        /* Clean out skb arrays. */
        for (i = 0; i < (RX_RING_SIZE + 1); i++)
@@ -924,55 +933,44 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
                mp->tx_skbs[i] = NULL;
        /* First check for EEPROM information. */
-        i = prom_getproperty(sdev->prom_node, "myrinet-eeprom-info",
+        prop = of_get_property(dp, "myrinet-eeprom-info", &len);
-                             (char *)&mp->eeprom, sizeof(struct myri_eeprom));
-        DET(("prom_getprop(myrinet-eeprom-info) returns %d\n", i));
+        if (prop)
-        if (i == 0 || i == -1) {
+                memcpy(&mp->eeprom, prop, sizeof(struct myri_eeprom));
+        if (!prop) {
                /* No eeprom property, must cook up the values ourselves. */
                DET(("No EEPROM: "));
                mp->eeprom.bus_type = BUS_TYPE_SBUS;
-                mp->eeprom.cpuvers = prom_getintdefault(sdev->prom_node,"cpu_version",0);
+                mp->eeprom.cpuvers =
-                mp->eeprom.cval = prom_getintdefault(sdev->prom_node,"clock_value",0);
+                        of_getintprop_default(dp, "cpu_version", 0);
-                mp->eeprom.ramsz = prom_getintdefault(sdev->prom_node,"sram_size",0);
+                mp->eeprom.cval =
-                DET(("cpuvers[%d] cval[%d] ramsz[%d]\n", mp->eeprom.cpuvers,
+                        of_getintprop_default(dp, "clock_value", 0);
-                     mp->eeprom.cval, mp->eeprom.ramsz));
+                mp->eeprom.ramsz = of_getintprop_default(dp, "sram_size", 0);
-                if (mp->eeprom.cpuvers == 0) {
+                if (!mp->eeprom.cpuvers)
-                        DET(("EEPROM: cpuvers was zero, setting to %04x\n",CPUVERS_2_3));
                        mp->eeprom.cpuvers = CPUVERS_2_3;
-                }
+                if (mp->eeprom.cpuvers < CPUVERS_3_0)
-                if (mp->eeprom.cpuvers < CPUVERS_3_0) {
-                        DET(("EEPROM: cpuvers < CPUVERS_3_0, clockval set to zero.\n"));
                        mp->eeprom.cval = 0;
-                }
+                if (!mp->eeprom.ramsz)
-                if (mp->eeprom.ramsz == 0) {
-                        DET(("EEPROM: ramsz == 0, setting to 128k\n"));
                        mp->eeprom.ramsz = (128 * 1024);
-                }
-                i = prom_getproperty(sdev->prom_node, "myrinet-board-id",
+                prop = of_get_property(dp, "myrinet-board-id", &len);
-                                     &prop_buf[0], 10);
+                if (prop)
-                DET(("EEPROM: prom_getprop(myrinet-board-id) returns %d\n", i));
+                        memcpy(&mp->eeprom.id[0], prop, 6);
-                if ((i != 0) && (i != -1))
-                        memcpy(&mp->eeprom.id[0], &prop_buf[0], 6);
                else
                        set_boardid_from_idprom(mp, num);
-                i = prom_getproperty(sdev->prom_node, "fpga_version",
-                                     &mp->eeprom.fvers[0], 32);
+                prop = of_get_property(dp, "fpga_version", &len);
-                DET(("EEPROM: prom_getprop(fpga_version) returns %d\n", i));
+                if (prop)
-                if (i == 0 || i == -1)
+                        memcpy(&mp->eeprom.fvers[0], prop, 32);
+                else
                        memset(&mp->eeprom.fvers[0], 0, 32);
                if (mp->eeprom.cpuvers == CPUVERS_4_1) {
-                        DET(("EEPROM: cpuvers CPUVERS_4_1, "));
+                        if (mp->eeprom.ramsz == (128 * 1024))
-                        if (mp->eeprom.ramsz == (128 * 1024)) {
-                                DET(("ramsize 128k, setting to 256k, "));
                                mp->eeprom.ramsz = (256 * 1024);
-                        }
+                        if ((mp->eeprom.cval == 0x40414041) ||
-                        if ((mp->eeprom.cval==0x40414041)||(mp->eeprom.cval==0x90449044)){
+                            (mp->eeprom.cval == 0x90449044))
-                                DET(("changing cval from %08x to %08x ",
-                                     mp->eeprom.cval, 0x50e450e4));
                                mp->eeprom.cval = 0x50e450e4;
-                        }
-                        DET(("\n"));
                }
        }
 #ifdef DEBUG_DETECT
@@ -991,8 +989,8 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
                 * XXX only a valid version for PCI cards?  Ask feldy...
                 */
                DET(("Mapping regs for cpuvers < CPUVERS_4_0\n"));
-                mp->regs = sbus_ioremap(&sdev->resource[0], 0,
+                mp->regs = of_ioremap(&op->resource[0], 0,
-                                        mp->reg_size, "MyriCOM Regs");
+                                      mp->reg_size, "MyriCOM Regs");
                if (!mp->regs) {
                        printk("MyriCOM: Cannot map MyriCOM registers.\n");
                        goto err;
@@ -1001,13 +999,12 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
                mp->lregs = mp->lanai + (0x10000 * 2);
        } else {
                DET(("Mapping regs for cpuvers >= CPUVERS_4_0\n"));
-                mp->cregs = sbus_ioremap(&sdev->resource[0], 0,
+                mp->cregs = of_ioremap(&op->resource[0], 0,
-                                         PAGE_SIZE, "MyriCOM Control Regs");
+                                       PAGE_SIZE, "MyriCOM Control Regs");
-                mp->lregs = sbus_ioremap(&sdev->resource[0], (256 * 1024),
+                mp->lregs = of_ioremap(&op->resource[0], (256 * 1024),
                                         PAGE_SIZE, "MyriCOM LANAI Regs");
-                mp->lanai =
+                mp->lanai = of_ioremap(&op->resource[0], (512 * 1024),
-                        sbus_ioremap(&sdev->resource[0], (512 * 1024),
+                                       mp->eeprom.ramsz, "MyriCOM SRAM");
-                                     mp->eeprom.ramsz, "MyriCOM SRAM");
        }
        DET(("Registers mapped: cregs[%p] lregs[%p] lanai[%p]\n",
             mp->cregs, mp->lregs, mp->lanai));
@@ -1039,16 +1036,15 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
        myri_reset_on(mp->cregs);
        /* Get the supported DVMA burst sizes from our SBUS. */
-        mp->myri_bursts = prom_getintdefault(mp->myri_sdev->bus->prom_node,
+        mp->myri_bursts = of_getintprop_default(dp->parent,
-                                             "burst-sizes", 0x00);
+                                                "burst-sizes", 0x00);
+        if (!sbus_can_burst64())
-        if (!sbus_can_burst64(sdev))
                mp->myri_bursts &= ~(DMA_BURST64);
        DET(("MYRI bursts %02x\n", mp->myri_bursts));
        /* Encode SBUS interrupt level in second control register. */
-        i = prom_getint(sdev->prom_node, "interrupts");
+        i = of_getintprop_default(dp, "interrupts", 0);
        if (i == 0)
                i = 4;
        DET(("prom_getint(interrupts)==%d, irqlvl set to %04x\n",
@@ -1063,7 +1059,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
        dev->tx_timeout = &myri_tx_timeout;
        dev->watchdog_timeo = 5*HZ;
        dev->set_multicast_list = &myri_set_multicast;
-        dev->irq = sdev->irqs[0];
+        dev->irq = op->irqs[0];
        /* Register interrupt handler now. */
        DET(("Requesting MYRIcom IRQ line.\n"));
@@ -1088,7 +1084,7 @@ static int __devinit myri_ether_init(struct sbus_dev *sdev)
                goto err_free_irq;
        }
-        dev_set_drvdata(&sdev->ofdev.dev, mp);
+        dev_set_drvdata(&op->dev, mp);
        num++;
@@ -1105,17 +1101,9 @@ err:
        return -ENODEV;
 }
+static int __devexit myri_sbus_remove(struct of_device *op)
-static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-{
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        return myri_ether_init(sdev);
-}
-static int __devexit myri_sbus_remove(struct of_device *dev)
 {
-        struct myri_eth *mp = dev_get_drvdata(&dev->dev);
+        struct myri_eth *mp = dev_get_drvdata(&op->dev);
        struct net_device *net_dev = mp->dev;
        unregister_netdev(net_dev);
@@ -1123,21 +1111,21 @@ static int __devexit myri_sbus_remove(struct of_device *dev)
        free_irq(net_dev->irq, net_dev);
        if (mp->eeprom.cpuvers < CPUVERS_4_0) {
-                sbus_iounmap(mp->regs, mp->reg_size);
+                of_iounmap(&op->resource[0], mp->regs, mp->reg_size);
        } else {
-                sbus_iounmap(mp->cregs, PAGE_SIZE);
+                of_iounmap(&op->resource[0], mp->cregs, PAGE_SIZE);
-                sbus_iounmap(mp->lregs, (256 * 1024));
+                of_iounmap(&op->resource[0], mp->lregs, (256 * 1024));
-                sbus_iounmap(mp->lanai, (512 * 1024));
+                of_iounmap(&op->resource[0], mp->lanai, (512 * 1024));
        }
        free_netdev(net_dev);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id myri_sbus_match[] = {
+static const struct of_device_id myri_sbus_match[] = {
        {
                .name = "MYRICOM,mlanai",
        },
@@ -1158,7 +1146,7 @@ static struct of_platform_driver myri_sbus_driver = {
 static int __init myri_sbus_init(void)
 {
-        return of_register_driver(&myri_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&myri_sbus_driver, &of_bus_type);
 }
 static void __exit myri_sbus_exit(void)
diff --git a/drivers/net/myri_sbus.h b/drivers/net/myri_sbus.h
index 5d93fcc95d55..ff363e95d9cf 100644
--- a/drivers/net/myri_sbus.h
+++ b/drivers/net/myri_sbus.h
@@ -288,7 +288,7 @@ struct myri_eth {
        struct myri_eeprom              eeprom;         /* Local copy of EEPROM.      */
        unsigned int                    reg_size;       /* Size of register space.    */
        unsigned int                    shmem_base;     /* Offset to shared ram.      */
-        struct sbus_dev                 *myri_sdev;     /* Our SBUS device struct.    */
+        struct of_device                *myri_op;       /* Our OF device struct.    */
 };
 /* We use this to acquire receive skb's that we can DMA directly into. */
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index e3be81eba8a4..ebc812702903 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9130,7 +9130,7 @@ static int __devexit niu_of_remove(struct of_device *op)
        return 0;
 }
-static struct of_device_id niu_match[] = {
+static const struct of_device_id niu_match[] = {
        {
                .name = "network",
                .compatible = "SUNW,niusl",
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 7112fd5e0e1b..08c4dd896077 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -355,9 +355,10 @@ static int tc574_config(struct pcmcia_device *link)
        for (i = j = 0; j < 0x400; j += 0x20) {
                link->io.BasePort1 = j ^ 0x300;
                i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS) break;
+                if (i == 0)
+                        break;
        }
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                cs_error(link, RequestIO, i);
                goto failed;
        }
@@ -377,7 +378,7 @@ static int tc574_config(struct pcmcia_device *link)
        tuple.TupleDataMax = 64;
        tuple.TupleOffset = 0;
        tuple.DesiredTuple = 0x88;
-        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+        if (pcmcia_get_first_tuple(link, &tuple) == 0) {
                pcmcia_get_tuple_data(link, &tuple);
                for (i = 0; i < 3; i++)
                        phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 29bd8532d323..c235cdba69c6 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -278,9 +278,10 @@ static int tc589_config(struct pcmcia_device *link)
        if (multi && (j & 0x80)) continue;
        link->io.BasePort1 = j ^ 0x300;
        i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
    }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        cs_error(link, RequestIO, i);
        goto failed;
    }
@@ -295,7 +296,7 @@ static int tc589_config(struct pcmcia_device *link)
    /* The 3c589 has an extra EEPROM for configuration info, including
       the hardware address.  The 3c562 puts the address in the CIS. */
    tuple.DesiredTuple = 0x88;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
        pcmcia_get_tuple_data(link, &tuple);
        for (i = 0; i < 3; i++)
            phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 52bf11b73c6e..b37a498939ae 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -262,7 +262,7 @@ static int try_io_port(struct pcmcia_device *link)
        if (link->io.NumPorts2 > 0) {
            /* for master/slave multifunction cards */
            link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-            link->irq.Attributes = 
+            link->irq.Attributes =
                IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
        }
    } else {
@@ -276,7 +276,8 @@ static int try_io_port(struct pcmcia_device *link)
            link->io.BasePort1 = j ^ 0x300;
            link->io.BasePort2 = (j ^ 0x300) + 0x10;
            ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
        }
        return ret;
    } else {
@@ -284,59 +285,50 @@ static int try_io_port(struct pcmcia_device *link)
    }
 }
+static int axnet_configcheck(struct pcmcia_device *p_dev,
+                             cistpl_cftable_entry_t *cfg,
+                             cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
+                             void *priv_data)
+{
+        int i;
+        cistpl_io_t *io = &cfg->io;
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -ENODEV;
+        p_dev->conf.ConfigIndex = 0x05;
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+        return -ENODEV;
+}
 static int axnet_config(struct pcmcia_device *link)
 {
    struct net_device *dev = link->priv;
    axnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
-    cisparse_t parse;
    int i, j, last_ret, last_fn;
-    u_short buf[64];
    DECLARE_MAC_BUF(mac);
    DEBUG(0, "axnet_config(0x%p)\n", link);
-    tuple.Attributes = 0;
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
    /* don't trust the CIS on this; Linksys got it wrong */
    link->conf.Present = 0x63;
+    last_ret = pcmcia_loop_config(link, axnet_configcheck, NULL);
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+    if (last_ret != 0) {
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-        
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                cfg->index == 0 || cfg->io.nwin == 0)
-            goto next_entry;
-        
-        link->conf.ConfigIndex = 0x05;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
        cs_error(link, RequestIO, last_ret);
        goto failed;
    }
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index ea9414c4d900..831090c75622 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -260,21 +260,21 @@ static int com20020_config(struct pcmcia_device *link)
    DEBUG(0, "com20020_config(0x%p)\n", link);
    DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
-    i = !CS_SUCCESS;
+    i = -ENODEV;
    if (!link->io.BasePort1)
    {
        for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
        {
            link->io.BasePort1 = ioaddr;
            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS)
+            if (i == 0)
                break;
        }
    }
    else
        i = pcmcia_request_io(link, &link->io);
    
-    if (i != CS_SUCCESS)
+    if (i != 0)
    {
        DEBUG(1,"arcnet: requestIO failed totally!\n");
        goto failed;
@@ -287,7 +287,7 @@ static int com20020_config(struct pcmcia_device *link)
           link->irq.AssignedIRQ,
           link->irq.IRQInfo1, link->irq.IRQInfo2);
    i = pcmcia_request_irq(link, &link->irq);
-    if (i != CS_SUCCESS)
+    if (i != 0)
    {
        DEBUG(1,"arcnet: requestIRQ failed totally!\n");
        goto failed;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index a550c9bd126f..69d916daa7bb 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -309,7 +309,8 @@ static int mfc_try_io_port(struct pcmcia_device *link)
            printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
        }
        ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) return ret;
+        if (ret == 0)
+                return ret;
    }
    return ret;
 }
@@ -325,7 +326,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
    for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
        link->io.BasePort1 = ioaddr;
        ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
            /* calculate ConfigIndex value */
            link->conf.ConfigIndex = 
                ((link->io.BasePort1 & 0x0f0) >> 3) | 0x22;
@@ -356,12 +357,12 @@ static int fmvj18x_config(struct pcmcia_device *link)
    tuple.TupleOffset = 0;
    tuple.DesiredTuple = CISTPL_FUNCE;
    tuple.TupleOffset = 0;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
        /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
        link->conf.ConfigIndex = parse.cftable_entry.index;
        switch (link->manf_id) {
        case MANFID_TDK:
@@ -430,10 +431,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
        link->irq.Attributes =
                IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT;
        ret = mfc_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
    } else if (cardtype == UNGERMANN) {
        ret = ungermann_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
    } else { 
        CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
    }
@@ -565,7 +566,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
    req.Base = 0; req.Size = 0;
    req.AccessSpeed = 0;
    i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        cs_error(link, RequestWindow, i);
        return -1;
    }
@@ -599,7 +600,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
    iounmap(base);
    j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
        cs_error(link, ReleaseWindow, j);
    return (i != 0x200) ? 0 : -1;
@@ -620,7 +621,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
    req.Base = 0; req.Size = 0;
    req.AccessSpeed = 0;
    i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        cs_error(link, RequestWindow, i);
        return -1;
    }
@@ -642,7 +643,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
    iounmap(base);
    j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
        cs_error(link, ReleaseWindow, j);
    return 0;
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 4eafa4f42cff..cf3cca4642f2 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -238,7 +238,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
    /* Try PRIMARY card at 0xA20-0xA23 */
    link->io.BasePort1 = 0xA20;
    i = pcmcia_request_io(link, &link->io);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        /* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
        link->io.BasePort1 = 0xA24;
        CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index ee5dcbfd0ba9..448cd40aeba5 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -925,7 +925,7 @@ static void mace_tx_timeout(struct net_device *dev)
  printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);
 #if RESET_ON_TIMEOUT
  printk("resetting card\n");
-  pcmcia_reset_card(link, NULL);
+  pcmcia_reset_card(link->socket);
 #else /* #if RESET_ON_TIMEOUT */
  printk("NOT resetting card\n");
 #endif /* #if RESET_ON_TIMEOUT */
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index ebc1ae6bcbe5..e40d6301aa7a 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -310,7 +310,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
    req.Base = 0; req.Size = 0;
    req.AccessSpeed = 0;
    i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        cs_error(link, RequestWindow, i);
        return NULL;
    }
@@ -333,7 +333,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
    iounmap(virt);
    j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
        cs_error(link, ReleaseWindow, j);
    return (i < NR_INFO) ? hw_info+i : NULL;
 } /* get_hwinfo */
@@ -504,7 +504,8 @@ static int try_io_port(struct pcmcia_device *link)
            link->io.BasePort1 = j ^ 0x300;
            link->io.BasePort2 = (j ^ 0x300) + 0x10;
            ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
        }
        return ret;
    } else {
@@ -512,58 +513,53 @@ static int try_io_port(struct pcmcia_device *link)
    }
 }
+static int pcnet_confcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cfg,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        int *has_shmem = priv_data;
+        int i;
+        cistpl_io_t *io = &cfg->io;
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -EINVAL;
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+        *has_shmem = ((cfg->mem.nwin == 1) &&
+                      (cfg->mem.win[0].len >= 0x4000));
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+        return 0;
+}
 static int pcnet_config(struct pcmcia_device *link)
 {
    struct net_device *dev = link->priv;
    pcnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
+    int last_ret, last_fn, start_pg, stop_pg, cm_offset;
-    cisparse_t parse;
-    int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
    int has_shmem = 0;
-    u_short buf[64];
    hw_info_t *local_hw_info;
    DECLARE_MAC_BUF(mac);
    DEBUG(0, "pcnet_config(0x%p)\n", link);
-    tuple.TupleData = (cisdata_t *)buf;
+    last_ret = pcmcia_loop_config(link, pcnet_confcheck, &has_shmem);
-    tuple.TupleDataMax = sizeof(buf);
+    if (last_ret) {
-    tuple.TupleOffset = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                        pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                        cfg->index == 0 || cfg->io.nwin == 0)
-                goto next_entry;
-        link->conf.ConfigIndex = cfg->index;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        has_shmem = ((cfg->mem.nwin == 1) &&
-                     (cfg->mem.win[0].len >= 0x4000));
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
        cs_error(link, RequestIO, last_ret);
        goto failed;
    }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 250eb1954c34..c74d6656d266 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -409,10 +409,13 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
        int i;
-        if ((i = pcmcia_get_first_tuple(handle, tuple)) != CS_SUCCESS ||
+        i = pcmcia_get_first_tuple(handle, tuple);
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+        if (i != 0)
                return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        i = pcmcia_get_tuple_data(handle, tuple);
+        if (i != 0)
+                return i;
+        return pcmcia_parse_tuple(tuple, parse);
 }
 static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
@@ -420,10 +423,10 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
        int i;
-        if ((i = pcmcia_get_next_tuple(handle, tuple)) != CS_SUCCESS ||
+        if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+                        (i = pcmcia_get_tuple_data(handle, tuple)) != 0)
                return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        return pcmcia_parse_tuple(tuple, parse);
 }
 /*======================================================================
@@ -459,27 +462,36 @@ static int mhz_3288_power(struct pcmcia_device *link)
    return 0;
 }
+static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        int k;
+        p_dev->io.BasePort2 = cf->io.win[0].base;
+        for (k = 0; k < 0x400; k += 0x10) {
+                if (k & 0x80)
+                        continue;
+                p_dev->io.BasePort1 = k ^ 0x300;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+}
 static int mhz_mfc_config(struct pcmcia_device *link)
 {
    struct net_device *dev = link->priv;
    struct smc_private *smc = netdev_priv(dev);
    struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
    win_req_t req;
    memreq_t mem;
-    int i, k;
+    int i;
    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
    if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
+            return -ENOMEM;
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
    link->conf.Attributes |= CONF_ENABLE_SPKR;
    link->conf.Status = CCSR_AUDIO_ENA;
@@ -489,27 +501,9 @@ static int mhz_mfc_config(struct pcmcia_device *link)
    link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
    link->io.NumPorts2 = 8;
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    i = first_tuple(link, tuple, parse);
    /* The Megahertz combo cards have modem-like CIS entries, so
       we have to explicitly try a bunch of port combinations. */
-    while (i == CS_SUCCESS) {
+    if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL))
-        link->conf.ConfigIndex = cf->index;
-        link->io.BasePort2 = cf->io.win[0].base;
-        for (k = 0; k < 0x400; k += 0x10) {
-            if (k & 0x80) continue;
-            link->io.BasePort1 = k ^ 0x300;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        if (i == CS_SUCCESS) break;
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i != CS_SUCCESS)
        goto free_cfg_mem;
    dev->base_addr = link->io.BasePort1;
@@ -518,7 +512,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
    req.Base = req.Size = 0;
    req.AccessSpeed = 0;
    i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS)
+    if (i != 0)
        goto free_cfg_mem;
    smc->base = ioremap(req.Base, req.Size);
    mem.CardOffset = mem.Page = 0;
@@ -526,14 +520,14 @@ static int mhz_mfc_config(struct pcmcia_device *link)
        mem.CardOffset = link->conf.ConfigBase;
    i = pcmcia_map_mem_page(link->win, &mem);
-    if ((i == CS_SUCCESS)
+    if ((i == 0)
        && (smc->manfid == MANFID_MEGAHERTZ)
        && (smc->cardid == PRODID_MEGAHERTZ_EM3288))
        mhz_3288_power(link);
 free_cfg_mem:
    kfree(cfg_mem);
-    return i;
+    return -ENODEV;
 }
 static int mhz_setup(struct pcmcia_device *link)
@@ -560,12 +554,12 @@ static int mhz_setup(struct pcmcia_device *link)
    /* Read the station address from the CIS.  It is stored as the last
       (fourth) string in the Version 1 Version/ID tuple. */
    tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) != 0) {
        rc = -1;
        goto free_cfg_mem;
    }
    /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
+    if (next_tuple(link, tuple, parse) != 0)
        first_tuple(link, tuple, parse);
    if (parse->version_1.ns > 3) {
        station_addr = parse->version_1.str + parse->version_1.ofs[3];
@@ -577,11 +571,11 @@ static int mhz_setup(struct pcmcia_device *link)
    /* Another possibility: for the EM3288, in a special tuple */
    tuple->DesiredTuple = 0x81;
-    if (pcmcia_get_first_tuple(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, tuple) != 0) {
        rc = -1;
        goto free_cfg_mem;
    }
-    if (pcmcia_get_tuple_data(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_tuple_data(link, tuple) != 0) {
        rc = -1;
        goto free_cfg_mem;
    }
@@ -660,46 +654,27 @@ static int mot_setup(struct pcmcia_device *link)
 /*====================================================================*/
+static int smc_configcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cf,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int smc_config(struct pcmcia_device *link)
 {
    struct net_device *dev = link->priv;
-    struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
    int i;
-    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
-    if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
    link->io.NumPorts1 = 16;
-    i = first_tuple(link, tuple, parse);
+    i = pcmcia_loop_config(link, smc_configcheck, NULL);
-    while (i != CS_NO_MORE_ITEMS) {
+    if (!i)
-        if (i == CS_SUCCESS) {
+            dev->base_addr = link->io.BasePort1;
-            link->conf.ConfigIndex = cf->index;
-            link->io.BasePort1 = cf->io.win[0].base;
-            link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i == CS_SUCCESS)
-        dev->base_addr = link->io.BasePort1;
-    kfree(cfg_mem);
    return i;
 }
@@ -715,7 +690,7 @@ static int smc_setup(struct pcmcia_device *link)
    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
    if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
+            return -ENOMEM;
    tuple = &cfg_mem->tuple;
    parse = &cfg_mem->parse;
@@ -728,12 +703,12 @@ static int smc_setup(struct pcmcia_device *link)
    /* Check for a LAN function extension tuple */
    tuple->DesiredTuple = CISTPL_FUNCE;
    i = first_tuple(link, tuple, parse);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
        if (parse->funce.type == CISTPL_FUNCE_LAN_NODE_ID)
            break;
        i = next_tuple(link, tuple, parse);
    }
-    if (i == CS_SUCCESS) {
+    if (i == 0) {
        node_id = (cistpl_lan_node_id_t *)parse->funce.data;
        if (node_id->nb == 6) {
            for (i = 0; i < 6; i++)
@@ -780,9 +755,10 @@ static int osi_config(struct pcmcia_device *link)
    for (i = j = 0; j < 4; j++) {
        link->io.BasePort2 = com[j];
        i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
    }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        /* Fallback: turn off hard decode */
        link->conf.ConfigIndex = 0x03;
        link->io.NumPorts2 = 0;
@@ -815,13 +791,13 @@ static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)
    /* Read the station address from tuple 0x90, subtuple 0x04 */
    tuple->DesiredTuple = 0x90;
    i = pcmcia_get_first_tuple(link, tuple);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
        i = pcmcia_get_tuple_data(link, tuple);
-        if ((i != CS_SUCCESS) || (buf[0] == 0x04))
+        if ((i != 0) || (buf[0] == 0x04))
            break;
        i = pcmcia_get_next_tuple(link, tuple);
    }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        rc = -1;
        goto free_cfg_mem;
    }
@@ -959,8 +935,11 @@ static int check_sig(struct pcmcia_device *link)
 ======================================================================*/
-#define CS_EXIT_TEST(ret, svc, label) \
+#define CS_EXIT_TEST(ret, svc, label)   \
-if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; }
+if (ret != 0) {                         \
+        cs_error(link, svc, ret);       \
+        goto label;                     \
+}
 static int smc91c92_config(struct pcmcia_device *link)
 {
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index c33a3d523566..e1fd585e7131 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -377,7 +377,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
        if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &&
                        (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
        return err;
 }
@@ -388,7 +388,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
        if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &&
                        (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
        return err;
 }
@@ -715,6 +715,47 @@ has_ce2_string(struct pcmcia_device * p_dev)
        return 0;
 }
+static int
+xirc2ps_config_modem(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        unsigned int ioaddr;
+        if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
+                for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
+                        p_dev->io.BasePort2 = cf->io.win[0].base;
+                        p_dev->io.BasePort1 = ioaddr;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
+}
+static int
+xirc2ps_config_check(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        int *pass = priv_data;
+        if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
+                p_dev->io.BasePort2 = cf->io.win[0].base;
+                p_dev->io.BasePort1 = p_dev->io.BasePort2
+                        + (*pass ? (cf->index & 0x20 ? -24:8)
+                           : (cf->index & 0x20 ?   8:-24));
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+}
 /****************
 * xirc2ps_config() is scheduled to run after a CARD_INSERTION event
 * is received, to configure the PCMCIA socket, and to make the
@@ -725,13 +766,12 @@ xirc2ps_config(struct pcmcia_device * link)
 {
    struct net_device *dev = link->priv;
    local_info_t *local = netdev_priv(dev);
+    unsigned int ioaddr;
    tuple_t tuple;
    cisparse_t parse;
-    unsigned int ioaddr;
    int err, i;
    u_char buf[64];
    cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
    DECLARE_MAC_BUF(mac);
    local->dingo_ccr = NULL;
@@ -846,19 +886,8 @@ xirc2ps_config(struct pcmcia_device * link)
            /* Take the Modem IO port from the CIS and scan for a free
             * Ethernet port */
            link->io.NumPorts1 = 16; /* no Mako stuff anymore */
-            tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+            if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL))
-            for (err = first_tuple(link, &tuple, &parse); !err;
+                    goto port_found;
-                                 err = next_tuple(link, &tuple, &parse)) {
-                if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
-                    for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = ioaddr;
-                        if (!(err=pcmcia_request_io(link, &link->io)))
-                            goto port_found;
-                    }
-                }
-            }
        } else {
            link->io.NumPorts1 = 18;
            /* We do 2 passes here: The first one uses the regular mapping and
@@ -866,21 +895,9 @@ xirc2ps_config(struct pcmcia_device * link)
             * mirrored every 32 bytes. Actually we use a mirrored port for
             * the Mako if (on the first pass) the COR bit 5 is set.
             */
-            for (pass=0; pass < 2; pass++) {
+            for (pass=0; pass < 2; pass++)
-                tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+                    if (!pcmcia_loop_config(link, xirc2ps_config_check, &pass))
-                for (err = first_tuple(link, &tuple, &parse); !err;
-                                     err = next_tuple(link, &tuple, &parse)){
-                    if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8){
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = link->io.BasePort2
-                                    + (pass ? (cf->index & 0x20 ? -24:8)
-                                            : (cf->index & 0x20 ?   8:-24));
-                        if (!(err=pcmcia_request_io(link, &link->io)))
                            goto port_found;
-                    }
-                }
-            }
            /* if special option:
             * try to configure as Ethernet only.
             * .... */
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 31e7384e312a..018d0fca9422 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1,7 +1,6 @@
-/* $Id: sunbmac.c,v 1.30 2002/01/15 06:48:55 davem Exp $
+/* sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters.
- * sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters.
 *
- * Copyright (C) 1997, 1998, 1999, 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1997, 1998, 1999, 2003, 2008 David S. Miller (davem@davemloft.net)
 */
 #include <linux/module.h>
@@ -23,6 +22,9 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/auxio.h>
 #include <asm/byteorder.h>
@@ -32,15 +34,14 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/pgtable.h>
-#include <asm/sbus.h>
 #include <asm/system.h>
 #include "sunbmac.h"
 #define DRV_NAME        "sunbmac"
-#define DRV_VERSION     "2.0"
+#define DRV_VERSION     "2.1"
-#define DRV_RELDATE     "11/24/03"
+#define DRV_RELDATE     "August 26, 2008"
-#define DRV_AUTHOR      "David S. Miller (davem@redhat.com)"
+#define DRV_AUTHOR      "David S. Miller (davem@davemloft.net)"
 static char version[] =
        DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
@@ -96,8 +97,8 @@ static int qec_global_reset(void __iomem *gregs)
 static void qec_init(struct bigmac *bp)
 {
+        struct of_device *qec_op = bp->qec_op;
        void __iomem *gregs = bp->gregs;
-        struct sbus_dev *qec_sdev = bp->qec_sdev;
        u8 bsizes = bp->bigmac_bursts;
        u32 regval;
@@ -112,13 +113,13 @@ static void qec_init(struct bigmac *bp)
        sbus_writel(GLOB_PSIZE_2048, gregs + GLOB_PSIZE);
        /* All of memsize is given to bigmac. */
-        sbus_writel(qec_sdev->reg_addrs[1].reg_size,
+        sbus_writel(resource_size(&qec_op->resource[1]),
                    gregs + GLOB_MSIZE);
        /* Half to the transmitter, half to the receiver. */
-        sbus_writel(qec_sdev->reg_addrs[1].reg_size >> 1,
+        sbus_writel(resource_size(&qec_op->resource[1]) >> 1,
                    gregs + GLOB_TSIZE);
-        sbus_writel(qec_sdev->reg_addrs[1].reg_size >> 1,
+        sbus_writel(resource_size(&qec_op->resource[1]) >> 1,
                    gregs + GLOB_RSIZE);
 }
@@ -239,9 +240,10 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
                skb_reserve(skb, 34);
                bb->be_rxd[i].rx_addr =
-                        sbus_map_single(bp->bigmac_sdev, skb->data,
+                        dma_map_single(&bp->bigmac_op->dev,
-                                        RX_BUF_ALLOC_SIZE - 34,
+                                       skb->data,
-                                        SBUS_DMA_FROMDEVICE);
+                                       RX_BUF_ALLOC_SIZE - 34,
+                                       DMA_FROM_DEVICE);
                bb->be_rxd[i].rx_flags =
                        (RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH));
        }
@@ -776,9 +778,9 @@ static void bigmac_tx(struct bigmac *bp)
                skb = bp->tx_skbs[elem];
                bp->enet_stats.tx_packets++;
                bp->enet_stats.tx_bytes += skb->len;
-                sbus_unmap_single(bp->bigmac_sdev,
+                dma_unmap_single(&bp->bigmac_op->dev,
-                                  this->tx_addr, skb->len,
+                                 this->tx_addr, skb->len,
-                                  SBUS_DMA_TODEVICE);
+                                 DMA_TO_DEVICE);
                DTX(("skb(%p) ", skb));
                bp->tx_skbs[elem] = NULL;
@@ -831,18 +833,19 @@ static void bigmac_rx(struct bigmac *bp)
                                drops++;
                                goto drop_it;
                        }
-                        sbus_unmap_single(bp->bigmac_sdev,
+                        dma_unmap_single(&bp->bigmac_op->dev,
-                                          this->rx_addr,
+                                         this->rx_addr,
-                                          RX_BUF_ALLOC_SIZE - 34,
+                                         RX_BUF_ALLOC_SIZE - 34,
-                                          SBUS_DMA_FROMDEVICE);
+                                         DMA_FROM_DEVICE);
                        bp->rx_skbs[elem] = new_skb;
                        new_skb->dev = bp->dev;
                        skb_put(new_skb, ETH_FRAME_LEN);
                        skb_reserve(new_skb, 34);
-                        this->rx_addr = sbus_map_single(bp->bigmac_sdev,
+                        this->rx_addr =
-                                                        new_skb->data,
+                                dma_map_single(&bp->bigmac_op->dev,
-                                                        RX_BUF_ALLOC_SIZE - 34,
+                                               new_skb->data,
-                                                        SBUS_DMA_FROMDEVICE);
+                                               RX_BUF_ALLOC_SIZE - 34,
+                                               DMA_FROM_DEVICE);
                        this->rx_flags =
                                (RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH));
@@ -857,13 +860,13 @@ static void bigmac_rx(struct bigmac *bp)
                        }
                        skb_reserve(copy_skb, 2);
                        skb_put(copy_skb, len);
-                        sbus_dma_sync_single_for_cpu(bp->bigmac_sdev,
+                        dma_sync_single_for_cpu(&bp->bigmac_op->dev,
-                                                     this->rx_addr, len,
+                                                this->rx_addr, len,
-                                                     SBUS_DMA_FROMDEVICE);
+                                                DMA_FROM_DEVICE);
                        skb_copy_to_linear_data(copy_skb, (unsigned char *)skb->data, len);
-                        sbus_dma_sync_single_for_device(bp->bigmac_sdev,
+                        dma_sync_single_for_device(&bp->bigmac_op->dev,
-                                                        this->rx_addr, len,
+                                                   this->rx_addr, len,
-                                                        SBUS_DMA_FROMDEVICE);
+                                                   DMA_FROM_DEVICE);
                        /* Reuse original ring buffer. */
                        this->rx_flags =
@@ -959,7 +962,8 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
        u32 mapping;
        len = skb->len;
-        mapping = sbus_map_single(bp->bigmac_sdev, skb->data, len, SBUS_DMA_TODEVICE);
+        mapping = dma_map_single(&bp->bigmac_op->dev, skb->data,
+                                 len, DMA_TO_DEVICE);
        /* Avoid a race... */
        spin_lock_irq(&bp->lock);
@@ -1051,12 +1055,8 @@ static void bigmac_set_multicast(struct net_device *dev)
 /* Ethtool support... */
 static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct bigmac *bp = dev->priv;
        strcpy(info->driver, "sunbmac");
        strcpy(info->version, "2.0");
-        sprintf(info->bus_info, "SBUS:%d",
-                bp->qec_sdev->slot);
 }
 static u32 bigmac_get_link(struct net_device *dev)
@@ -1075,14 +1075,15 @@ static const struct ethtool_ops bigmac_ethtool_ops = {
        .get_link               = bigmac_get_link,
 };
-static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
+static int __devinit bigmac_ether_init(struct of_device *op,
+                                       struct of_device *qec_op)
 {
-        struct net_device *dev;
        static int version_printed;
-        struct bigmac *bp;
+        struct net_device *dev;
        u8 bsizes, bsizes_more;
-        int i;
        DECLARE_MAC_BUF(mac);
+        struct bigmac *bp;
+        int i;
        /* Get a new device struct for this interface. */
        dev = alloc_etherdev(sizeof(struct bigmac));
@@ -1092,32 +1093,21 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
        if (version_printed++ == 0)
                printk(KERN_INFO "%s", version);
-        dev->base_addr = (long) qec_sdev;
        for (i = 0; i < 6; i++)
                dev->dev_addr[i] = idprom->id_ethaddr[i];
        /* Setup softc, with backpointers to QEC and BigMAC SBUS device structs. */
-        bp = dev->priv;
+        bp = netdev_priv(dev);
-        bp->qec_sdev = qec_sdev;
+        bp->qec_op = qec_op;
-        bp->bigmac_sdev = qec_sdev->child;
+        bp->bigmac_op = op;
-        SET_NETDEV_DEV(dev, &bp->bigmac_sdev->ofdev.dev);
+        SET_NETDEV_DEV(dev, &op->dev);
        spin_lock_init(&bp->lock);
-        /* Verify the registers we expect, are actually there. */
-        if ((bp->bigmac_sdev->num_registers != 3) ||
-           (bp->qec_sdev->num_registers != 2)) {
-                printk(KERN_ERR "BIGMAC: Device does not have 2 and 3 regs, it has %d and %d.\n",
-                       bp->qec_sdev->num_registers,
-                       bp->bigmac_sdev->num_registers);
-                printk(KERN_ERR "BIGMAC: Would you like that for here or to go?\n");
-                goto fail_and_cleanup;
-        }
        /* Map in QEC global control registers. */
-        bp->gregs = sbus_ioremap(&bp->qec_sdev->resource[0], 0,
+        bp->gregs = of_ioremap(&qec_op->resource[0], 0,
-                                 GLOB_REG_SIZE, "BigMAC QEC GLobal Regs");
+                               GLOB_REG_SIZE, "BigMAC QEC GLobal Regs");
        if (!bp->gregs) {
                printk(KERN_ERR "BIGMAC: Cannot map QEC global registers.\n");
                goto fail_and_cleanup;
@@ -1134,13 +1124,8 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
                goto fail_and_cleanup;
        /* Get supported SBUS burst sizes. */
-        bsizes = prom_getintdefault(bp->qec_sdev->prom_node,
+        bsizes = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
-                                    "burst-sizes",
+        bsizes_more = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
-                                    0xff);
-        bsizes_more = prom_getintdefault(bp->qec_sdev->bus->prom_node,
-                                         "burst-sizes",
-                                         0xff);
        bsizes &= 0xff;
        if (bsizes_more != 0xff)
@@ -1154,16 +1139,16 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
        qec_init(bp);
        /* Map in the BigMAC channel registers. */
-        bp->creg = sbus_ioremap(&bp->bigmac_sdev->resource[0], 0,
+        bp->creg = of_ioremap(&op->resource[0], 0,
-                                CREG_REG_SIZE, "BigMAC QEC Channel Regs");
+                              CREG_REG_SIZE, "BigMAC QEC Channel Regs");
        if (!bp->creg) {
                printk(KERN_ERR "BIGMAC: Cannot map QEC channel registers.\n");
                goto fail_and_cleanup;
        }
        /* Map in the BigMAC control registers. */
-        bp->bregs = sbus_ioremap(&bp->bigmac_sdev->resource[1], 0,
+        bp->bregs = of_ioremap(&op->resource[1], 0,
-                                 BMAC_REG_SIZE, "BigMAC Primary Regs");
+                               BMAC_REG_SIZE, "BigMAC Primary Regs");
        if (!bp->bregs) {
                printk(KERN_ERR "BIGMAC: Cannot map BigMAC primary registers.\n");
                goto fail_and_cleanup;
@@ -1172,8 +1157,8 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
        /* Map in the BigMAC transceiver registers, this is how you poke at
         * the BigMAC's PHY.
         */
-        bp->tregs = sbus_ioremap(&bp->bigmac_sdev->resource[2], 0,
+        bp->tregs = of_ioremap(&op->resource[2], 0,
-                                 TCVR_REG_SIZE, "BigMAC Transceiver Regs");
+                               TCVR_REG_SIZE, "BigMAC Transceiver Regs");
        if (!bp->tregs) {
                printk(KERN_ERR "BIGMAC: Cannot map BigMAC transceiver registers.\n");
                goto fail_and_cleanup;
@@ -1183,17 +1168,17 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
        bigmac_stop(bp);
        /* Allocate transmit/receive descriptor DVMA block. */
-        bp->bmac_block = sbus_alloc_consistent(bp->bigmac_sdev,
+        bp->bmac_block = dma_alloc_coherent(&bp->bigmac_op->dev,
-                                               PAGE_SIZE,
+                                            PAGE_SIZE,
-                                               &bp->bblock_dvma);
+                                            &bp->bblock_dvma, GFP_ATOMIC);
        if (bp->bmac_block == NULL || bp->bblock_dvma == 0) {
                printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");
                goto fail_and_cleanup;
        }
        /* Get the board revision of this BigMAC. */
-        bp->board_rev = prom_getintdefault(bp->bigmac_sdev->prom_node,
+        bp->board_rev = of_getintprop_default(bp->bigmac_op->node,
-                                           "board-version", 1);
+                                              "board-version", 1);
        /* Init auto-negotiation timer state. */
        init_timer(&bp->bigmac_timer);
@@ -1217,7 +1202,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
        dev->watchdog_timeo = 5*HZ;
        /* Finish net device registration. */
-        dev->irq = bp->bigmac_sdev->irqs[0];
+        dev->irq = bp->bigmac_op->irqs[0];
        dev->dma = 0;
        if (register_netdev(dev)) {
@@ -1225,7 +1210,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
                goto fail_and_cleanup;
        }
-        dev_set_drvdata(&bp->bigmac_sdev->ofdev.dev, bp);
+        dev_set_drvdata(&bp->bigmac_op->dev, bp);
        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %s\n",
               dev->name, print_mac(mac, dev->dev_addr));
@@ -1236,66 +1221,67 @@ fail_and_cleanup:
        /* Something went wrong, undo whatever we did so far. */
        /* Free register mappings if any. */
        if (bp->gregs)
-                sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
+                of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
        if (bp->creg)
-                sbus_iounmap(bp->creg, CREG_REG_SIZE);
+                of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);
        if (bp->bregs)
-                sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
+                of_iounmap(&op->resource[1], bp->bregs, BMAC_REG_SIZE);
        if (bp->tregs)
-                sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
+                of_iounmap(&op->resource[2], bp->tregs, TCVR_REG_SIZE);
        if (bp->bmac_block)
-                sbus_free_consistent(bp->bigmac_sdev,
+                dma_free_coherent(&bp->bigmac_op->dev,
-                                     PAGE_SIZE,
+                                  PAGE_SIZE,
-                                     bp->bmac_block,
+                                  bp->bmac_block,
-                                     bp->bblock_dvma);
+                                  bp->bblock_dvma);
        /* This also frees the co-located 'dev->priv' */
        free_netdev(dev);
        return -ENODEV;
 }
-/* QEC can be the parent of either QuadEthernet or
+/* QEC can be the parent of either QuadEthernet or a BigMAC.  We want
- * a BigMAC.  We want the latter.
+ * the latter.
 */
-static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit bigmac_sbus_probe(struct of_device *op,
+                                       const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        struct device *parent = op->dev.parent;
-        struct device_node *dp = dev->node;
+        struct of_device *qec_op;
-        if (!strcmp(dp->name, "be"))
+        qec_op = to_of_device(parent);
-                sdev = sdev->parent;
-        return bigmac_ether_init(sdev);
+        return bigmac_ether_init(op, qec_op);
 }
-static int __devexit bigmac_sbus_remove(struct of_device *dev)
+static int __devexit bigmac_sbus_remove(struct of_device *op)
 {
-        struct bigmac *bp = dev_get_drvdata(&dev->dev);
+        struct bigmac *bp = dev_get_drvdata(&op->dev);
+        struct device *parent = op->dev.parent;
        struct net_device *net_dev = bp->dev;
+        struct of_device *qec_op;
+        qec_op = to_of_device(parent);
        unregister_netdev(net_dev);
-        sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
+        of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
-        sbus_iounmap(bp->creg, CREG_REG_SIZE);
+        of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);
-        sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
+        of_iounmap(&op->resource[1], bp->bregs, BMAC_REG_SIZE);
-        sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
+        of_iounmap(&op->resource[2], bp->tregs, TCVR_REG_SIZE);
-        sbus_free_consistent(bp->bigmac_sdev,
+        dma_free_coherent(&op->dev,
-                             PAGE_SIZE,
+                          PAGE_SIZE,
-                             bp->bmac_block,
+                          bp->bmac_block,
-                             bp->bblock_dvma);
+                          bp->bblock_dvma);
        free_netdev(net_dev);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id bigmac_sbus_match[] = {
+static const struct of_device_id bigmac_sbus_match[] = {
-        {
-                .name = "qec",
-        },
        {
                .name = "be",
        },
@@ -1313,7 +1299,7 @@ static struct of_platform_driver bigmac_sbus_driver = {
 static int __init bigmac_init(void)
 {
-        return of_register_driver(&bigmac_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&bigmac_sbus_driver, &of_bus_type);
 }
 static void __exit bigmac_exit(void)
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h
index b563d3c2993e..8840bc0b840b 100644
--- a/drivers/net/sunbmac.h
+++ b/drivers/net/sunbmac.h
@@ -329,8 +329,8 @@ struct bigmac {
        unsigned int            timer_ticks;
        struct net_device_stats enet_stats;
-        struct sbus_dev         *qec_sdev;
+        struct of_device        *qec_op;
-        struct sbus_dev         *bigmac_sdev;
+        struct of_device        *bigmac_op;
        struct net_device       *dev;
 };
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index b79d5f018f79..f1ebeb5f65b2 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3,7 +3,7 @@
 *           "Happy Meal Ethernet" found on SunSwift SBUS cards.
 *
 * Copyright (C) 1996, 1998, 1999, 2002, 2003,
-                 2006 David S. Miller (davem@davemloft.net)
+ *              2006, 2008 David S. Miller (davem@davemloft.net)
 *
 * Changes :
 * 2000/11/11 Willy Tarreau <willy AT meta-x.org>
@@ -34,6 +34,7 @@
 #include <linux/skbuff.h>
 #include <linux/mm.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -41,8 +42,9 @@
 #include <asm/byteorder.h>
 #ifdef CONFIG_SPARC
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/idprom.h>
-#include <asm/sbus.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
@@ -60,8 +62,8 @@
 #include "sunhme.h"
 #define DRV_NAME        "sunhme"
-#define DRV_VERSION     "3.00"
+#define DRV_VERSION     "3.10"
-#define DRV_RELDATE     "June 23, 2006"
+#define DRV_RELDATE     "August 26, 2008"
 #define DRV_AUTHOR      "David S. Miller (davem@davemloft.net)"
 static char version[] =
@@ -251,13 +253,13 @@ static u32 pci_hme_read_desc32(hme32 *p)
 #define hme_read_desc32(__hp, __p) \
        ((__hp)->read_desc32(__p))
 #define hme_dma_map(__hp, __ptr, __size, __dir) \
-        ((__hp)->dma_map((__hp)->happy_dev, (__ptr), (__size), (__dir)))
+        ((__hp)->dma_map((__hp)->dma_dev, (__ptr), (__size), (__dir)))
 #define hme_dma_unmap(__hp, __addr, __size, __dir) \
-        ((__hp)->dma_unmap((__hp)->happy_dev, (__addr), (__size), (__dir)))
+        ((__hp)->dma_unmap((__hp)->dma_dev, (__addr), (__size), (__dir)))
 #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
-        ((__hp)->dma_sync_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir)))
+        ((__hp)->dma_sync_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir)))
 #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
-        ((__hp)->dma_sync_for_device((__hp)->happy_dev, (__addr), (__size), (__dir)))
+        ((__hp)->dma_sync_for_device((__hp)->dma_dev, (__addr), (__size), (__dir)))
 #else
 #ifdef CONFIG_SBUS
 /* SBUS only compilation */
@@ -277,13 +279,13 @@ do {	(__txd)->tx_addr = (__force hme32)(u32)(__addr); \
 } while(0)
 #define hme_read_desc32(__hp, __p)      ((__force u32)(hme32)*(__p))
 #define hme_dma_map(__hp, __ptr, __size, __dir) \
-        sbus_map_single((__hp)->happy_dev, (__ptr), (__size), (__dir))
+        dma_map_single((__hp)->dma_dev, (__ptr), (__size), (__dir))
 #define hme_dma_unmap(__hp, __addr, __size, __dir) \
-        sbus_unmap_single((__hp)->happy_dev, (__addr), (__size), (__dir))
+        dma_unmap_single((__hp)->dma_dev, (__addr), (__size), (__dir))
 #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
-        sbus_dma_sync_single_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir))
+        dma_dma_sync_single_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir))
 #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
-        sbus_dma_sync_single_for_device((__hp)->happy_dev, (__addr), (__size), (__dir))
+        dma_dma_sync_single_for_device((__hp)->dma_dev, (__addr), (__size), (__dir))
 #else
 /* PCI only compilation */
 #define hme_write32(__hp, __reg, __val) \
@@ -305,36 +307,17 @@ static inline u32 hme_read_desc32(struct happy_meal *hp, hme32 *p)
        return le32_to_cpup((__le32 *)p);
 }
 #define hme_dma_map(__hp, __ptr, __size, __dir) \
-        pci_map_single((__hp)->happy_dev, (__ptr), (__size), (__dir))
+        pci_map_single((__hp)->dma_dev, (__ptr), (__size), (__dir))
 #define hme_dma_unmap(__hp, __addr, __size, __dir) \
-        pci_unmap_single((__hp)->happy_dev, (__addr), (__size), (__dir))
+        pci_unmap_single((__hp)->dma_dev, (__addr), (__size), (__dir))
 #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
-        pci_dma_sync_single_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir))
+        pci_dma_sync_single_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir))
 #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
-        pci_dma_sync_single_for_device((__hp)->happy_dev, (__addr), (__size), (__dir))
+        pci_dma_sync_single_for_device((__hp)->dma_dev, (__addr), (__size), (__dir))
 #endif
 #endif
-#ifdef SBUS_DMA_BIDIRECTIONAL
-#       define DMA_BIDIRECTIONAL        SBUS_DMA_BIDIRECTIONAL
-#else
-#       define DMA_BIDIRECTIONAL        0
-#endif
-#ifdef SBUS_DMA_FROMDEVICE
-#       define DMA_FROMDEVICE           SBUS_DMA_FROMDEVICE
-#else
-#       define DMA_TODEVICE             1
-#endif
-#ifdef SBUS_DMA_TODEVICE
-#       define DMA_TODEVICE             SBUS_DMA_TODEVICE
-#else
-#       define DMA_FROMDEVICE           2
-#endif
 /* Oh yes, the MIF BitBang is mighty fun to program.  BitBucket is more like it. */
 static void BB_PUT_BIT(struct happy_meal *hp, void __iomem *tregs, int bit)
 {
@@ -1224,7 +1207,8 @@ static void happy_meal_clean_rings(struct happy_meal *hp)
                        rxd = &hp->happy_block->happy_meal_rxd[i];
                        dma_addr = hme_read_desc32(hp, &rxd->rx_addr);
-                        hme_dma_unmap(hp, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE);
+                        dma_unmap_single(hp->dma_dev, dma_addr,
+                                         RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);
                        dev_kfree_skb_any(skb);
                        hp->rx_skbs[i] = NULL;
                }
@@ -1242,10 +1226,10 @@ static void happy_meal_clean_rings(struct happy_meal *hp)
                        for (frag = 0; frag <= skb_shinfo(skb)->nr_frags; frag++) {
                                txd = &hp->happy_block->happy_meal_txd[i];
                                dma_addr = hme_read_desc32(hp, &txd->tx_addr);
-                                hme_dma_unmap(hp, dma_addr,
+                                dma_unmap_single(hp->dma_dev, dma_addr,
-                                              (hme_read_desc32(hp, &txd->tx_flags)
+                                                 (hme_read_desc32(hp, &txd->tx_flags)
-                                               & TXFLAG_SIZE),
+                                                  & TXFLAG_SIZE),
-                                              DMA_TODEVICE);
+                                                 DMA_TO_DEVICE);
                                if (frag != skb_shinfo(skb)->nr_frags)
                                        i++;
@@ -1287,7 +1271,8 @@ static void happy_meal_init_rings(struct happy_meal *hp)
                skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4));
                hme_write_rxd(hp, &hb->happy_meal_rxd[i],
                              (RXFLAG_OWN | ((RX_BUF_ALLOC_SIZE - RX_OFFSET) << 16)),
-                              hme_dma_map(hp, skb->data, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE));
+                              dma_map_single(hp->dma_dev, skb->data, RX_BUF_ALLOC_SIZE,
+                                             DMA_FROM_DEVICE));
                skb_reserve(skb, RX_OFFSET);
        }
@@ -1593,7 +1578,7 @@ static int happy_meal_init(struct happy_meal *hp)
        if ((hp->happy_bursts & DMA_BURST64) &&
            ((hp->happy_flags & HFLAG_PCI) != 0
 #ifdef CONFIG_SBUS
-             || sbus_can_burst64(hp->happy_dev)
+             || sbus_can_burst64()
 #endif
             || 0)) {
                u32 gcfg = GREG_CFG_BURST64;
@@ -1603,11 +1588,13 @@ static int happy_meal_init(struct happy_meal *hp)
                 * do not.  -DaveM
                 */
 #ifdef CONFIG_SBUS
-                if ((hp->happy_flags & HFLAG_PCI) == 0 &&
+                if ((hp->happy_flags & HFLAG_PCI) == 0) {
-                    sbus_can_dma_64bit(hp->happy_dev)) {
+                        struct of_device *op = hp->happy_dev;
-                        sbus_set_sbus64(hp->happy_dev,
+                        if (sbus_can_dma_64bit()) {
-                                        hp->happy_bursts);
+                                sbus_set_sbus64(&op->dev,
-                        gcfg |= GREG_CFG_64BIT;
+                                                hp->happy_bursts);
+                                gcfg |= GREG_CFG_64BIT;
+                        }
                }
 #endif
@@ -1966,7 +1953,7 @@ static void happy_meal_tx(struct happy_meal *hp)
                        dma_len = hme_read_desc32(hp, &this->tx_flags);
                        dma_len &= TXFLAG_SIZE;
-                        hme_dma_unmap(hp, dma_addr, dma_len, DMA_TODEVICE);
+                        dma_unmap_single(hp->dma_dev, dma_addr, dma_len, DMA_TO_DEVICE);
                        elem = NEXT_TX(elem);
                        this = &txbase[elem];
@@ -2044,13 +2031,14 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
                                drops++;
                                goto drop_it;
                        }
-                        hme_dma_unmap(hp, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE);
+                        dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);
                        hp->rx_skbs[elem] = new_skb;
                        new_skb->dev = dev;
                        skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4));
                        hme_write_rxd(hp, this,
                                      (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
-                                      hme_dma_map(hp, new_skb->data, RX_BUF_ALLOC_SIZE, DMA_FROMDEVICE));
+                                      dma_map_single(hp->dma_dev, new_skb->data, RX_BUF_ALLOC_SIZE,
+                                                     DMA_FROM_DEVICE));
                        skb_reserve(new_skb, RX_OFFSET);
                        /* Trim the original skb for the netif. */
@@ -2065,10 +2053,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
                        skb_reserve(copy_skb, 2);
                        skb_put(copy_skb, len);
-                        hme_dma_sync_for_cpu(hp, dma_addr, len, DMA_FROMDEVICE);
+                        dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
                        skb_copy_from_linear_data(skb, copy_skb->data, len);
-                        hme_dma_sync_for_device(hp, dma_addr, len, DMA_FROMDEVICE);
+                        dma_sync_single_for_device(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
                        /* Reuse original ring buffer. */
                        hme_write_rxd(hp, this,
                                      (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
@@ -2300,7 +2287,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
                u32 mapping, len;
                len = skb->len;
-                mapping = hme_dma_map(hp, skb->data, len, DMA_TODEVICE);
+                mapping = dma_map_single(hp->dma_dev, skb->data, len, DMA_TO_DEVICE);
                tx_flags |= (TXFLAG_SOP | TXFLAG_EOP);
                hme_write_txd(hp, &hp->happy_block->happy_meal_txd[entry],
                              (tx_flags | (len & TXFLAG_SIZE)),
@@ -2314,7 +2301,8 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 * Otherwise we could race with the device.
                 */
                first_len = skb_headlen(skb);
-                first_mapping = hme_dma_map(hp, skb->data, first_len, DMA_TODEVICE);
+                first_mapping = dma_map_single(hp->dma_dev, skb->data, first_len,
+                                               DMA_TO_DEVICE);
                entry = NEXT_TX(entry);
                for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
@@ -2322,10 +2310,9 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        u32 len, mapping, this_txflags;
                        len = this_frag->size;
-                        mapping = hme_dma_map(hp,
+                        mapping = dma_map_page(hp->dma_dev, this_frag->page,
-                                              ((void *) page_address(this_frag->page) +
+                                               this_frag->page_offset, len,
-                                               this_frag->page_offset),
+                                               DMA_TO_DEVICE);
-                                              len, DMA_TODEVICE);
                        this_txflags = tx_flags;
                        if (frag == skb_shinfo(skb)->nr_frags - 1)
                                this_txflags |= TXFLAG_EOP;
@@ -2493,9 +2480,12 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
        }
 #ifdef CONFIG_SBUS
        else {
-                struct sbus_dev *sdev = hp->happy_dev;
+                const struct linux_prom_registers *regs;
-                sprintf(info->bus_info, "SBUS:%d",
+                struct of_device *op = hp->happy_dev;
-                        sdev->slot);
+                regs = of_get_property(op->node, "regs", NULL);
+                if (regs)
+                        sprintf(info->bus_info, "SBUS:%d",
+                                regs->which_io);
        }
 #endif
 }
@@ -2521,63 +2511,21 @@ static const struct ethtool_ops hme_ethtool_ops = {
 static int hme_version_printed;
 #ifdef CONFIG_SBUS
-void __devinit quattro_get_ranges(struct quattro *qp)
-{
-        struct sbus_dev *sdev = qp->quattro_dev;
-        int err;
-        err = prom_getproperty(sdev->prom_node,
-                               "ranges",
-                               (char *)&qp->ranges[0],
-                               sizeof(qp->ranges));
-        if (err == 0 || err == -1) {
-                qp->nranges = 0;
-                return;
-        }
-        qp->nranges = (err / sizeof(struct linux_prom_ranges));
-}
-static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)
-{
-        struct sbus_dev *sdev = hp->happy_dev;
-        int rng;
-        for (rng = 0; rng < qp->nranges; rng++) {
-                struct linux_prom_ranges *rngp = &qp->ranges[rng];
-                int reg;
-                for (reg = 0; reg < 5; reg++) {
-                        if (sdev->reg_addrs[reg].which_io ==
-                            rngp->ot_child_space)
-                                break;
-                }
-                if (reg == 5)
-                        continue;
-                sdev->reg_addrs[reg].which_io = rngp->ot_parent_space;
-                sdev->reg_addrs[reg].phys_addr += rngp->ot_parent_base;
-        }
-}
 /* Given a happy meal sbus device, find it's quattro parent.
 * If none exist, allocate and return a new one.
 *
 * Return NULL on failure.
 */
-static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)
+static struct quattro * __devinit quattro_sbus_find(struct of_device *child)
 {
-        struct sbus_dev *sdev;
+        struct device *parent = child->dev.parent;
+        struct of_device *op;
        struct quattro *qp;
-        int i;
-        for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
+        op = to_of_device(parent);
-                for (i = 0, sdev = qp->quattro_dev;
+        qp = dev_get_drvdata(&op->dev);
-                     (sdev != NULL) && (i < 4);
+        if (qp)
-                     sdev = sdev->next, i++) {
+                return qp;
-                        if (sdev == goal_sdev)
-                                return qp;
-                }
-        }
        qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);
        if (qp != NULL) {
@@ -2586,10 +2534,11 @@ static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)
                for (i = 0; i < 4; i++)
                        qp->happy_meals[i] = NULL;
-                qp->quattro_dev = goal_sdev;
+                qp->quattro_dev = child;
                qp->next = qfe_sbus_list;
                qfe_sbus_list = qp;
-                quattro_get_ranges(qp);
+                dev_set_drvdata(&op->dev, qp);
        }
        return qp;
 }
@@ -2602,10 +2551,10 @@ static void __init quattro_sbus_register_irqs(void)
        struct quattro *qp;
        for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
-                struct sbus_dev *sdev = qp->quattro_dev;
+                struct of_device *op = qp->quattro_dev;
                int err;
-                err = request_irq(sdev->irqs[0],
+                err = request_irq(op->irqs[0],
                                  quattro_sbus_interrupt,
                                  IRQF_SHARED, "Quattro",
                                  qp);
@@ -2621,9 +2570,9 @@ static void quattro_sbus_free_irqs(void)
        struct quattro *qp;
        for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
-                struct sbus_dev *sdev = qp->quattro_dev;
+                struct of_device *op = qp->quattro_dev;
-                free_irq(sdev->irqs[0], qp);
+                free_irq(op->irqs[0], qp);
        }
 }
 #endif /* CONFIG_SBUS */
@@ -2660,9 +2609,9 @@ static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev)
 #endif /* CONFIG_PCI */
 #ifdef CONFIG_SBUS
-static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe)
+static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
 {
-        struct device_node *dp = sdev->ofdev.node;
+        struct device_node *dp = op->node, *sbus_dp;
        struct quattro *qp = NULL;
        struct happy_meal *hp;
        struct net_device *dev;
@@ -2671,7 +2620,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        DECLARE_MAC_BUF(mac);
        if (is_qfe) {
-                qp = quattro_sbus_find(sdev);
+                qp = quattro_sbus_find(op);
                if (qp == NULL)
                        goto err_out;
                for (qfe_slot = 0; qfe_slot < 4; qfe_slot++)
@@ -2685,7 +2634,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        dev = alloc_etherdev(sizeof(struct happy_meal));
        if (!dev)
                goto err_out;
-        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
+        SET_NETDEV_DEV(dev, &op->dev);
        if (hme_version_printed++ == 0)
                printk(KERN_INFO "%s", version);
@@ -2713,56 +2662,50 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
                        memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
        }
-        hp = dev->priv;
+        hp = netdev_priv(dev);
-        hp->happy_dev = sdev;
+        hp->happy_dev = op;
+        hp->dma_dev = &op->dev;
        spin_lock_init(&hp->happy_lock);
        err = -ENODEV;
-        if (sdev->num_registers != 5) {
-                printk(KERN_ERR "happymeal: Device needs 5 regs, has %d.\n",
-                       sdev->num_registers);
-                goto err_out_free_netdev;
-        }
        if (qp != NULL) {
                hp->qfe_parent = qp;
                hp->qfe_ent = qfe_slot;
                qp->happy_meals[qfe_slot] = dev;
-                quattro_apply_ranges(qp, hp);
        }
-        hp->gregs = sbus_ioremap(&sdev->resource[0], 0,
+        hp->gregs = of_ioremap(&op->resource[0], 0,
-                                 GREG_REG_SIZE, "HME Global Regs");
+                               GREG_REG_SIZE, "HME Global Regs");
        if (!hp->gregs) {
                printk(KERN_ERR "happymeal: Cannot map global registers.\n");
                goto err_out_free_netdev;
        }
-        hp->etxregs = sbus_ioremap(&sdev->resource[1], 0,
+        hp->etxregs = of_ioremap(&op->resource[1], 0,
-                                   ETX_REG_SIZE, "HME TX Regs");
+                                 ETX_REG_SIZE, "HME TX Regs");
        if (!hp->etxregs) {
                printk(KERN_ERR "happymeal: Cannot map MAC TX registers.\n");
                goto err_out_iounmap;
        }
-        hp->erxregs = sbus_ioremap(&sdev->resource[2], 0,
+        hp->erxregs = of_ioremap(&op->resource[2], 0,
-                                   ERX_REG_SIZE, "HME RX Regs");
+                                 ERX_REG_SIZE, "HME RX Regs");
        if (!hp->erxregs) {
                printk(KERN_ERR "happymeal: Cannot map MAC RX registers.\n");
                goto err_out_iounmap;
        }
-        hp->bigmacregs = sbus_ioremap(&sdev->resource[3], 0,
+        hp->bigmacregs = of_ioremap(&op->resource[3], 0,
-                                      BMAC_REG_SIZE, "HME BIGMAC Regs");
+                                    BMAC_REG_SIZE, "HME BIGMAC Regs");
        if (!hp->bigmacregs) {
                printk(KERN_ERR "happymeal: Cannot map BIGMAC registers.\n");
                goto err_out_iounmap;
        }
-        hp->tcvregs = sbus_ioremap(&sdev->resource[4], 0,
+        hp->tcvregs = of_ioremap(&op->resource[4], 0,
-                                   TCVR_REG_SIZE, "HME Tranceiver Regs");
+                                 TCVR_REG_SIZE, "HME Tranceiver Regs");
        if (!hp->tcvregs) {
                printk(KERN_ERR "happymeal: Cannot map TCVR registers.\n");
                goto err_out_iounmap;
@@ -2781,13 +2724,18 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        if (qp != NULL)
                hp->happy_flags |= HFLAG_QUATTRO;
+        sbus_dp = to_of_device(op->dev.parent)->node;
+        if (is_qfe)
+                sbus_dp = to_of_device(op->dev.parent->parent)->node;
        /* Get the supported DVMA burst sizes from our Happy SBUS. */
-        hp->happy_bursts = of_getintprop_default(sdev->bus->ofdev.node,
+        hp->happy_bursts = of_getintprop_default(sbus_dp,
                                                 "burst-sizes", 0x00);
-        hp->happy_block = sbus_alloc_consistent(hp->happy_dev,
+        hp->happy_block = dma_alloc_coherent(hp->dma_dev,
-                                                PAGE_SIZE,
+                                             PAGE_SIZE,
-                                                &hp->hblock_dvma);
+                                             &hp->hblock_dvma,
+                                             GFP_ATOMIC);
        err = -ENOMEM;
        if (!hp->happy_block) {
                printk(KERN_ERR "happymeal: Cannot allocate descriptors.\n");
@@ -2816,19 +2764,13 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        /* Happy Meal can do it all... */
        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
-        dev->irq = sdev->irqs[0];
+        dev->irq = op->irqs[0];
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
-        /* Hook up PCI register/dma accessors. */
+        /* Hook up SBUS register/descriptor accessors. */
        hp->read_desc32 = sbus_hme_read_desc32;
        hp->write_txd = sbus_hme_write_txd;
        hp->write_rxd = sbus_hme_write_rxd;
-        hp->dma_map = (u32 (*)(void *, void *, long, int))sbus_map_single;
-        hp->dma_unmap = (void (*)(void *, u32, long, int))sbus_unmap_single;
-        hp->dma_sync_for_cpu = (void (*)(void *, u32, long, int))
-                sbus_dma_sync_single_for_cpu;
-        hp->dma_sync_for_device = (void (*)(void *, u32, long, int))
-                sbus_dma_sync_single_for_device;
        hp->read32 = sbus_hme_read32;
        hp->write32 = sbus_hme_write32;
 #endif
@@ -2843,10 +2785,10 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        if (register_netdev(hp->dev)) {
                printk(KERN_ERR "happymeal: Cannot register net device, "
                       "aborting.\n");
-                goto err_out_free_consistent;
+                goto err_out_free_coherent;
        }
-        dev_set_drvdata(&sdev->ofdev.dev, hp);
+        dev_set_drvdata(&op->dev, hp);
        if (qfe_slot != -1)
                printk(KERN_INFO "%s: Quattro HME slot %d (SBUS) 10/100baseT Ethernet ",
@@ -2859,23 +2801,23 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
        return 0;
-err_out_free_consistent:
+err_out_free_coherent:
-        sbus_free_consistent(hp->happy_dev,
+        dma_free_coherent(hp->dma_dev,
-                             PAGE_SIZE,
+                          PAGE_SIZE,
-                             hp->happy_block,
+                          hp->happy_block,
-                             hp->hblock_dvma);
+                          hp->hblock_dvma);
 err_out_iounmap:
        if (hp->gregs)
-                sbus_iounmap(hp->gregs, GREG_REG_SIZE);
+                of_iounmap(&op->resource[0], hp->gregs, GREG_REG_SIZE);
        if (hp->etxregs)
-                sbus_iounmap(hp->etxregs, ETX_REG_SIZE);
+                of_iounmap(&op->resource[1], hp->etxregs, ETX_REG_SIZE);
        if (hp->erxregs)
-                sbus_iounmap(hp->erxregs, ERX_REG_SIZE);
+                of_iounmap(&op->resource[2], hp->erxregs, ERX_REG_SIZE);
        if (hp->bigmacregs)
-                sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE);
+                of_iounmap(&op->resource[3], hp->bigmacregs, BMAC_REG_SIZE);
        if (hp->tcvregs)
-                sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE);
+                of_iounmap(&op->resource[4], hp->tcvregs, TCVR_REG_SIZE);
 err_out_free_netdev:
        free_netdev(dev);
@@ -3035,6 +2977,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
        memset(hp, 0, sizeof(*hp));
        hp->happy_dev = pdev;
+        hp->dma_dev = &pdev->dev;
        spin_lock_init(&hp->happy_lock);
@@ -3121,7 +3064,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
 #endif
        hp->happy_block = (struct hmeal_init_block *)
-                pci_alloc_consistent(pdev, PAGE_SIZE, &hp->hblock_dvma);
+                dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &hp->hblock_dvma, GFP_KERNEL);
        err = -ENODEV;
        if (!hp->happy_block) {
@@ -3151,16 +3094,10 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
-        /* Hook up PCI register/dma accessors. */
+        /* Hook up PCI register/descriptor accessors. */
        hp->read_desc32 = pci_hme_read_desc32;
        hp->write_txd = pci_hme_write_txd;
        hp->write_rxd = pci_hme_write_rxd;
-        hp->dma_map = (u32 (*)(void *, void *, long, int))pci_map_single;
-        hp->dma_unmap = (void (*)(void *, u32, long, int))pci_unmap_single;
-        hp->dma_sync_for_cpu = (void (*)(void *, u32, long, int))
-                pci_dma_sync_single_for_cpu;
-        hp->dma_sync_for_device = (void (*)(void *, u32, long, int))
-                pci_dma_sync_single_for_device;
        hp->read32 = pci_hme_read32;
        hp->write32 = pci_hme_write32;
 #endif
@@ -3231,10 +3168,8 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)
        unregister_netdev(net_dev);
-        pci_free_consistent(hp->happy_dev,
+        dma_free_coherent(hp->dma_dev, PAGE_SIZE,
-                            PAGE_SIZE,
+                          hp->happy_block, hp->hblock_dvma);
-                            hp->happy_block,
-                            hp->hblock_dvma);
        iounmap(hp->gregs);
        pci_release_regions(hp->happy_dev);
@@ -3279,46 +3214,45 @@ static void happy_meal_pci_exit(void)
 #endif
 #ifdef CONFIG_SBUS
-static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        struct device_node *dp = op->node;
-        struct device_node *dp = dev->node;
        const char *model = of_get_property(dp, "model", NULL);
        int is_qfe = (match->data != NULL);
        if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
                is_qfe = 1;
-        return happy_meal_sbus_probe_one(sdev, is_qfe);
+        return happy_meal_sbus_probe_one(op, is_qfe);
 }
-static int __devexit hme_sbus_remove(struct of_device *dev)
+static int __devexit hme_sbus_remove(struct of_device *op)
 {
-        struct happy_meal *hp = dev_get_drvdata(&dev->dev);
+        struct happy_meal *hp = dev_get_drvdata(&op->dev);
        struct net_device *net_dev = hp->dev;
        unregister_netdev(net_dev);
        /* XXX qfe parent interrupt... */
-        sbus_iounmap(hp->gregs, GREG_REG_SIZE);
+        of_iounmap(&op->resource[0], hp->gregs, GREG_REG_SIZE);
-        sbus_iounmap(hp->etxregs, ETX_REG_SIZE);
+        of_iounmap(&op->resource[1], hp->etxregs, ETX_REG_SIZE);
-        sbus_iounmap(hp->erxregs, ERX_REG_SIZE);
+        of_iounmap(&op->resource[2], hp->erxregs, ERX_REG_SIZE);
-        sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE);
+        of_iounmap(&op->resource[3], hp->bigmacregs, BMAC_REG_SIZE);
-        sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE);
+        of_iounmap(&op->resource[4], hp->tcvregs, TCVR_REG_SIZE);
-        sbus_free_consistent(hp->happy_dev,
+        dma_free_coherent(hp->dma_dev,
-                             PAGE_SIZE,
+                          PAGE_SIZE,
-                             hp->happy_block,
+                          hp->happy_block,
-                             hp->hblock_dvma);
+                          hp->hblock_dvma);
        free_netdev(net_dev);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id hme_sbus_match[] = {
+static const struct of_device_id hme_sbus_match[] = {
        {
                .name = "SUNW,hme",
        },
@@ -3346,7 +3280,7 @@ static int __init happy_meal_sbus_init(void)
 {
        int err;
-        err = of_register_driver(&hme_sbus_driver, &sbus_bus_type);
+        err = of_register_driver(&hme_sbus_driver, &of_bus_type);
        if (!err)
                quattro_sbus_register_irqs();
diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index 4da5539fac7b..efd2ca0fcad3 100644
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -405,14 +405,11 @@ struct happy_meal {
        u32 (*read_desc32)(hme32 *);
        void (*write_txd)(struct happy_meal_txd *, u32, u32);
        void (*write_rxd)(struct happy_meal_rxd *, u32, u32);
-        u32 (*dma_map)(void *, void *, long, int);
-        void (*dma_unmap)(void *, u32, long, int);
-        void (*dma_sync_for_cpu)(void *, u32, long, int);
-        void (*dma_sync_for_device)(void *, u32, long, int);
 #endif
-        /* This is either a sbus_dev or a pci_dev. */
+        /* This is either an of_device or a pci_dev. */
        void                      *happy_dev;
+        struct device             *dma_dev;
        spinlock_t                happy_lock;
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 4e994f87469e..704301a5a7ff 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -91,6 +91,9 @@ static char lancestr[] = "LANCE";
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -98,7 +101,6 @@ static char lancestr[] = "LANCE";
 #include <asm/pgtable.h>
 #include <asm/byteorder.h>      /* Used by the checksum routines */
 #include <asm/idprom.h>
-#include <asm/sbus.h>
 #include <asm/prom.h>
 #include <asm/auxio.h>          /* For tpe-link-test? setting */
 #include <asm/irq.h>
@@ -248,7 +250,7 @@ struct lance_private {
        int             rx_new, tx_new;
        int             rx_old, tx_old;
-        struct sbus_dma *ledma; /* If set this points to ledma  */
+        struct of_device *ledma;        /* If set this points to ledma  */
        char            tpe;            /* cable-selection is TPE       */
        char            auto_select;    /* cable-selection by carrier   */
        char            burst_sizes;    /* ledma SBus burst sizes       */
@@ -263,7 +265,8 @@ struct lance_private {
        char                   *name;
        dma_addr_t              init_block_dvma;
        struct net_device      *dev;              /* Backpointer        */
-        struct sbus_dev        *sdev;
+        struct of_device       *op;
+        struct of_device       *lebuffer;
        struct timer_list       multicast_timer;
 };
@@ -1272,27 +1275,29 @@ static void lance_set_multicast_retry(unsigned long _opaque)
 static void lance_free_hwresources(struct lance_private *lp)
 {
        if (lp->lregs)
-                sbus_iounmap(lp->lregs, LANCE_REG_SIZE);
+                of_iounmap(&lp->op->resource[0], lp->lregs, LANCE_REG_SIZE);
+        if (lp->dregs) {
+                struct of_device *ledma = lp->ledma;
+                of_iounmap(&ledma->resource[0], lp->dregs,
+                           resource_size(&ledma->resource[0]));
+        }
        if (lp->init_block_iomem) {
-                sbus_iounmap(lp->init_block_iomem,
+                of_iounmap(&lp->lebuffer->resource[0], lp->init_block_iomem,
-                             sizeof(struct lance_init_block));
+                           sizeof(struct lance_init_block));
        } else if (lp->init_block_mem) {
-                sbus_free_consistent(lp->sdev,
+                dma_free_coherent(&lp->op->dev,
-                                     sizeof(struct lance_init_block),
+                                  sizeof(struct lance_init_block),
-                                     lp->init_block_mem,
+                                  lp->init_block_mem,
-                                     lp->init_block_dvma);
+                                  lp->init_block_dvma);
        }
 }
 /* Ethtool support... */
 static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct lance_private *lp = netdev_priv(dev);
        strcpy(info->driver, "sunlance");
        strcpy(info->version, "2.02");
-        sprintf(info->bus_info, "SBUS:%d",
-                lp->sdev->slot);
 }
 static u32 sparc_lance_get_link(struct net_device *dev)
@@ -1308,16 +1313,16 @@ static const struct ethtool_ops sparc_lance_ethtool_ops = {
        .get_link               = sparc_lance_get_link,
 };
-static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
+static int __devinit sparc_lance_probe_one(struct of_device *op,
-                                           struct sbus_dma *ledma,
+                                           struct of_device *ledma,
-                                           struct sbus_dev *lebuffer)
+                                           struct of_device *lebuffer)
 {
+        struct device_node *dp = op->node;
        static unsigned version_printed;
-        struct device_node *dp = sdev->ofdev.node;
-        struct net_device *dev;
        struct lance_private *lp;
-        int    i;
+        struct net_device *dev;
        DECLARE_MAC_BUF(mac);
+        int    i;
        dev = alloc_etherdev(sizeof(struct lance_private) + 8);
        if (!dev)
@@ -1338,14 +1343,27 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                dev->dev_addr[i] = idprom->id_ethaddr[i];
        /* Get the IO region */
-        lp->lregs = sbus_ioremap(&sdev->resource[0], 0,
+        lp->lregs = of_ioremap(&op->resource[0], 0,
-                                 LANCE_REG_SIZE, lancestr);
+                               LANCE_REG_SIZE, lancestr);
        if (!lp->lregs) {
                printk(KERN_ERR "SunLance: Cannot map registers.\n");
                goto fail;
        }
-        lp->sdev = sdev;
+        lp->ledma = ledma;
+        if (lp->ledma) {
+                lp->dregs = of_ioremap(&ledma->resource[0], 0,
+                                       resource_size(&ledma->resource[0]),
+                                       "ledma");
+                if (!lp->dregs) {
+                        printk(KERN_ERR "SunLance: Cannot map "
+                               "ledma registers.\n");
+                        goto fail;
+                }
+        }
+        lp->op = op;
+        lp->lebuffer = lebuffer;
        if (lebuffer) {
                /* sanity check */
                if (lebuffer->resource[0].start & 7) {
@@ -1353,8 +1371,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                        goto fail;
                }
                lp->init_block_iomem =
-                        sbus_ioremap(&lebuffer->resource[0], 0,
+                        of_ioremap(&lebuffer->resource[0], 0,
-                                     sizeof(struct lance_init_block), "lebuffer");
+                                   sizeof(struct lance_init_block), "lebuffer");
                if (!lp->init_block_iomem) {
                        printk(KERN_ERR "SunLance: Cannot map PIO buffer.\n");
                        goto fail;
@@ -1366,9 +1384,10 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                lp->tx = lance_tx_pio;
        } else {
                lp->init_block_mem =
-                        sbus_alloc_consistent(sdev, sizeof(struct lance_init_block),
+                        dma_alloc_coherent(&op->dev,
-                                              &lp->init_block_dvma);
+                                           sizeof(struct lance_init_block),
-                if (!lp->init_block_mem || lp->init_block_dvma == 0) {
+                                           &lp->init_block_dvma, GFP_ATOMIC);
+                if (!lp->init_block_mem) {
                        printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
                        goto fail;
                }
@@ -1383,13 +1402,13 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                                                      LE_C3_BCON));
        lp->name = lancestr;
-        lp->ledma = ledma;
        lp->burst_sizes = 0;
        if (lp->ledma) {
-                struct device_node *ledma_dp = ledma->sdev->ofdev.node;
+                struct device_node *ledma_dp = ledma->node;
-                const char *prop;
+                struct device_node *sbus_dp;
                unsigned int sbmask;
+                const char *prop;
                u32 csr;
                /* Find burst-size property for ledma */
@@ -1397,7 +1416,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
                                                        "burst-sizes", 0);
                /* ledma may be capable of fast bursts, but sbus may not. */
-                sbmask = of_getintprop_default(ledma_dp, "burst-sizes",
+                sbus_dp = ledma_dp->parent;
+                sbmask = of_getintprop_default(sbus_dp, "burst-sizes",
                                               DMA_BURSTBITS);
                lp->burst_sizes &= sbmask;
@@ -1435,8 +1455,6 @@ no_link_test:
                        lp->tpe = 1;
                }
-                lp->dregs = ledma->regs;
                /* Reset ledma */
                csr = sbus_readl(lp->dregs + DMA_CSR);
                sbus_writel(csr | DMA_RST_ENET, lp->dregs + DMA_CSR);
@@ -1446,7 +1464,7 @@ no_link_test:
                lp->dregs = NULL;
        lp->dev = dev;
-        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
+        SET_NETDEV_DEV(dev, &op->dev);
        dev->open = &lance_open;
        dev->stop = &lance_close;
        dev->hard_start_xmit = &lance_start_xmit;
@@ -1455,9 +1473,7 @@ no_link_test:
        dev->set_multicast_list = &lance_set_multicast;
        dev->ethtool_ops = &sparc_lance_ethtool_ops;
-        dev->irq = sdev->irqs[0];
+        dev->irq = op->irqs[0];
-        dev->dma = 0;
        /* We cannot sleep if the chip is busy during a
         * multicast list update event, because such events
@@ -1473,7 +1489,7 @@ no_link_test:
                goto fail;
        }
-        dev_set_drvdata(&sdev->ofdev.dev, lp);
+        dev_set_drvdata(&op->dev, lp);
        printk(KERN_INFO "%s: LANCE %s\n",
               dev->name, print_mac(mac, dev->dev_addr));
@@ -1486,80 +1502,25 @@ fail:
        return -ENODEV;
 }
-/* On 4m, find the associated dma for the lance chip */
+static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
-static struct sbus_dma * __devinit find_ledma(struct sbus_dev *sdev)
-{
-        struct sbus_dma *p;
-        for_each_dvma(p) {
-                if (p->sdev == sdev)
-                        return p;
-        }
-        return NULL;
-}
-#ifdef CONFIG_SUN4
-#include <asm/sun4paddr.h>
-#include <asm/machines.h>
-/* Find all the lance cards on the system and initialize them */
-static struct sbus_dev sun4_sdev;
-static int __devinit sparc_lance_init(void)
-{
-        if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) ||
-            (idprom->id_machtype == (SM_SUN4|SM_4_470))) {
-                memset(&sun4_sdev, 0, sizeof(struct sbus_dev));
-                sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;
-                sun4_sdev.irqs[0] = 6;
-                return sparc_lance_probe_one(&sun4_sdev, NULL, NULL);
-        }
-        return -ENODEV;
-}
-static int __exit sunlance_sun4_remove(void)
 {
-        struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev);
+        struct of_device *parent = to_of_device(op->dev.parent);
-        struct net_device *net_dev = lp->dev;
+        struct device_node *parent_dp = parent->node;
-        unregister_netdev(net_dev);
-        lance_free_hwresources(lp);
-        free_netdev(net_dev);
-        dev_set_drvdata(&sun4_sdev.ofdev.dev, NULL);
-        return 0;
-}
-#else /* !CONFIG_SUN4 */
-static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-{
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
        int err;
-        if (sdev->parent) {
+        if (!strcmp(parent_dp->name, "ledma")) {
-                struct of_device *parent = &sdev->parent->ofdev;
+                err = sparc_lance_probe_one(op, parent, NULL);
+        } else if (!strcmp(parent_dp->name, "lebuffer")) {
-                if (!strcmp(parent->node->name, "ledma")) {
+                err = sparc_lance_probe_one(op, NULL, parent);
-                        struct sbus_dma *ledma = find_ledma(to_sbus_device(&parent->dev));
-                        err = sparc_lance_probe_one(sdev, ledma, NULL);
-                } else if (!strcmp(parent->node->name, "lebuffer")) {
-                        err = sparc_lance_probe_one(sdev, NULL, to_sbus_device(&parent->dev));
-                } else
-                        err = sparc_lance_probe_one(sdev, NULL, NULL);
        } else
-                err = sparc_lance_probe_one(sdev, NULL, NULL);
+                err = sparc_lance_probe_one(op, NULL, NULL);
        return err;
 }
-static int __devexit sunlance_sbus_remove(struct of_device *dev)
+static int __devexit sunlance_sbus_remove(struct of_device *op)
 {
-        struct lance_private *lp = dev_get_drvdata(&dev->dev);
+        struct lance_private *lp = dev_get_drvdata(&op->dev);
        struct net_device *net_dev = lp->dev;
        unregister_netdev(net_dev);
@@ -1568,12 +1529,12 @@ static int __devexit sunlance_sbus_remove(struct of_device *dev)
        free_netdev(net_dev);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id sunlance_sbus_match[] = {
+static const struct of_device_id sunlance_sbus_match[] = {
        {
                .name = "le",
        },
@@ -1593,17 +1554,12 @@ static struct of_platform_driver sunlance_sbus_driver = {
 /* Find all the lance cards on the system and initialize them */
 static int __init sparc_lance_init(void)
 {
-        return of_register_driver(&sunlance_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
 }
-#endif /* !CONFIG_SUN4 */
 static void __exit sparc_lance_exit(void)
 {
-#ifdef CONFIG_SUN4
-        sunlance_sun4_remove();
-#else
        of_unregister_driver(&sunlance_sbus_driver);
-#endif
 }
 module_init(sparc_lance_init);
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index e811331d4608..f63644744ff9 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -3,7 +3,7 @@
 *          controller out there can be most efficiently programmed
 *          if you make it look like a LANCE.
 *
- * Copyright (C) 1996, 1999, 2003, 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 1996, 1999, 2003, 2006, 2008 David S. Miller (davem@davemloft.net)
 */
 #include <linux/module.h>
@@ -24,13 +24,15 @@
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
 #include <asm/idprom.h>
-#include <asm/sbus.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/auxio.h>
@@ -40,8 +42,8 @@
 #include "sunqe.h"
 #define DRV_NAME        "sunqe"
-#define DRV_VERSION     "4.0"
+#define DRV_VERSION     "4.1"
-#define DRV_RELDATE     "June 23, 2006"
+#define DRV_RELDATE     "August 27, 2008"
 #define DRV_AUTHOR      "David S. Miller (davem@davemloft.net)"
 static char version[] =
@@ -690,12 +692,18 @@ static void qe_set_multicast(struct net_device *dev)
 /* Ethtool support... */
 static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
+        const struct linux_prom_registers *regs;
        struct sunqe *qep = dev->priv;
+        struct of_device *op;
        strcpy(info->driver, "sunqe");
        strcpy(info->version, "3.0");
-        sprintf(info->bus_info, "SBUS:%d",
-                qep->qe_sdev->slot);
+        op = qep->op;
+        regs = of_get_property(op->node, "reg", NULL);
+        if (regs)
+                sprintf(info->bus_info, "SBUS:%d", regs->which_io);
 }
 static u32 qe_get_link(struct net_device *dev)
@@ -717,11 +725,11 @@ static const struct ethtool_ops qe_ethtool_ops = {
 };
 /* This is only called once at boot time for each card probed. */
-static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)
+static void qec_init_once(struct sunqec *qecp, struct of_device *op)
 {
        u8 bsizes = qecp->qec_bursts;
-        if (sbus_can_burst64(qsdev) && (bsizes & DMA_BURST64)) {
+        if (sbus_can_burst64() && (bsizes & DMA_BURST64)) {
                sbus_writel(GLOB_CTRL_B64, qecp->gregs + GLOB_CTRL);
        } else if (bsizes & DMA_BURST32) {
                sbus_writel(GLOB_CTRL_B32, qecp->gregs + GLOB_CTRL);
@@ -735,15 +743,15 @@ static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)
        sbus_writel(GLOB_PSIZE_2048, qecp->gregs + GLOB_PSIZE);
        /* Set the local memsize register, divided up to one piece per QE channel. */
-        sbus_writel((qsdev->reg_addrs[1].reg_size >> 2),
+        sbus_writel((resource_size(&op->resource[1]) >> 2),
                    qecp->gregs + GLOB_MSIZE);
        /* Divide up the local QEC memory amongst the 4 QE receiver and
         * transmitter FIFOs.  Basically it is (total / 2 / num_channels).
         */
-        sbus_writel((qsdev->reg_addrs[1].reg_size >> 2) >> 1,
+        sbus_writel((resource_size(&op->resource[1]) >> 2) >> 1,
                    qecp->gregs + GLOB_TSIZE);
-        sbus_writel((qsdev->reg_addrs[1].reg_size >> 2) >> 1,
+        sbus_writel((resource_size(&op->resource[1]) >> 2) >> 1,
                    qecp->gregs + GLOB_RSIZE);
 }
@@ -767,24 +775,21 @@ static u8 __devinit qec_get_burst(struct device_node *dp)
        return bsizes;
 }
-static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)
+static struct sunqec * __devinit get_qec(struct of_device *child)
 {
-        struct sbus_dev *qec_sdev = child_sdev->parent;
+        struct of_device *op = to_of_device(child->dev.parent);
        struct sunqec *qecp;
-        for (qecp = root_qec_dev; qecp; qecp = qecp->next_module) {
+        qecp = dev_get_drvdata(&op->dev);
-                if (qecp->qec_sdev == qec_sdev)
-                        break;
-        }
        if (!qecp) {
                qecp = kzalloc(sizeof(struct sunqec), GFP_KERNEL);
                if (qecp) {
                        u32 ctrl;
-                        qecp->qec_sdev = qec_sdev;
+                        qecp->op = op;
-                        qecp->gregs = sbus_ioremap(&qec_sdev->resource[0], 0,
+                        qecp->gregs = of_ioremap(&op->resource[0], 0,
-                                                   GLOB_REG_SIZE,
+                                                 GLOB_REG_SIZE,
-                                                   "QEC Global Registers");
+                                                 "QEC Global Registers");
                        if (!qecp->gregs)
                                goto fail;
@@ -799,16 +804,18 @@ static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)
                        if (qec_global_reset(qecp->gregs))
                                goto fail;
-                        qecp->qec_bursts = qec_get_burst(qec_sdev->ofdev.node);
+                        qecp->qec_bursts = qec_get_burst(op->node);
-                        qec_init_once(qecp, qec_sdev);
+                        qec_init_once(qecp, op);
-                        if (request_irq(qec_sdev->irqs[0], &qec_interrupt,
+                        if (request_irq(op->irqs[0], &qec_interrupt,
                                        IRQF_SHARED, "qec", (void *) qecp)) {
                                printk(KERN_ERR "qec: Can't register irq.\n");
                                goto fail;
                        }
+                        dev_set_drvdata(&op->dev, qecp);
                        qecp->next_module = root_qec_dev;
                        root_qec_dev = qecp;
                }
@@ -818,17 +825,17 @@ static struct sunqec * __devinit get_qec(struct sbus_dev *child_sdev)
 fail:
        if (qecp->gregs)
-                sbus_iounmap(qecp->gregs, GLOB_REG_SIZE);
+                of_iounmap(&op->resource[0], qecp->gregs, GLOB_REG_SIZE);
        kfree(qecp);
        return NULL;
 }
-static int __devinit qec_ether_init(struct sbus_dev *sdev)
+static int __devinit qec_ether_init(struct of_device *op)
 {
        static unsigned version_printed;
        struct net_device *dev;
-        struct sunqe *qe;
        struct sunqec *qecp;
+        struct sunqe *qe;
        int i, res;
        if (version_printed++ == 0)
@@ -842,49 +849,42 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
        qe = netdev_priv(dev);
-        i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);
+        res = -ENODEV;
-        if (i == -1) {
-                struct sbus_dev *td = sdev->parent->child;
+        i = of_getintprop_default(op->node, "channel#", -1);
-                i = 0;
+        if (i == -1)
-                while (td != sdev) {
+                goto fail;
-                        td = td->next;
-                        i++;
-                }
-        }
        qe->channel = i;
        spin_lock_init(&qe->lock);
-        res = -ENODEV;
+        qecp = get_qec(op);
-        qecp = get_qec(sdev);
        if (!qecp)
                goto fail;
        qecp->qes[qe->channel] = qe;
        qe->dev = dev;
        qe->parent = qecp;
-        qe->qe_sdev = sdev;
+        qe->op = op;
        res = -ENOMEM;
-        qe->qcregs = sbus_ioremap(&qe->qe_sdev->resource[0], 0,
+        qe->qcregs = of_ioremap(&op->resource[0], 0,
-                                  CREG_REG_SIZE, "QEC Channel Registers");
+                                CREG_REG_SIZE, "QEC Channel Registers");
        if (!qe->qcregs) {
                printk(KERN_ERR "qe: Cannot map channel registers.\n");
                goto fail;
        }
-        qe->mregs = sbus_ioremap(&qe->qe_sdev->resource[1], 0,
+        qe->mregs = of_ioremap(&op->resource[1], 0,
-                                 MREGS_REG_SIZE, "QE MACE Registers");
+                               MREGS_REG_SIZE, "QE MACE Registers");
        if (!qe->mregs) {
                printk(KERN_ERR "qe: Cannot map MACE registers.\n");
                goto fail;
        }
-        qe->qe_block = sbus_alloc_consistent(qe->qe_sdev,
+        qe->qe_block = dma_alloc_coherent(&op->dev, PAGE_SIZE,
-                                             PAGE_SIZE,
+                                          &qe->qblock_dvma, GFP_ATOMIC);
-                                             &qe->qblock_dvma);
+        qe->buffers = dma_alloc_coherent(&op->dev, sizeof(struct sunqe_buffers),
-        qe->buffers = sbus_alloc_consistent(qe->qe_sdev,
+                                         &qe->buffers_dvma, GFP_ATOMIC);
-                                            sizeof(struct sunqe_buffers),
-                                            &qe->buffers_dvma);
        if (qe->qe_block == NULL || qe->qblock_dvma == 0 ||
            qe->buffers == NULL || qe->buffers_dvma == 0)
                goto fail;
@@ -892,7 +892,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
        /* Stop this QE. */
        qe_stop(qe);
-        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
+        SET_NETDEV_DEV(dev, &op->dev);
        dev->open = qe_open;
        dev->stop = qe_close;
@@ -900,7 +900,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
        dev->set_multicast_list = qe_set_multicast;
        dev->tx_timeout = qe_tx_timeout;
        dev->watchdog_timeo = 5*HZ;
-        dev->irq = sdev->irqs[0];
+        dev->irq = op->irqs[0];
        dev->dma = 0;
        dev->ethtool_ops = &qe_ethtool_ops;
@@ -908,7 +908,7 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
        if (res)
                goto fail;
-        dev_set_drvdata(&sdev->ofdev.dev, qe);
+        dev_set_drvdata(&op->dev, qe);
        printk(KERN_INFO "%s: qe channel[%d] ", dev->name, qe->channel);
        for (i = 0; i < 6; i++)
@@ -922,58 +922,50 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
 fail:
        if (qe->qcregs)
-                sbus_iounmap(qe->qcregs, CREG_REG_SIZE);
+                of_iounmap(&op->resource[0], qe->qcregs, CREG_REG_SIZE);
        if (qe->mregs)
-                sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
+                of_iounmap(&op->resource[1], qe->mregs, MREGS_REG_SIZE);
        if (qe->qe_block)
-                sbus_free_consistent(qe->qe_sdev,
+                dma_free_coherent(&op->dev, PAGE_SIZE,
-                                     PAGE_SIZE,
+                                  qe->qe_block, qe->qblock_dvma);
-                                     qe->qe_block,
-                                     qe->qblock_dvma);
        if (qe->buffers)
-                sbus_free_consistent(qe->qe_sdev,
+                dma_free_coherent(&op->dev,
-                                     sizeof(struct sunqe_buffers),
+                                  sizeof(struct sunqe_buffers),
-                                     qe->buffers,
+                                  qe->buffers,
-                                     qe->buffers_dvma);
+                                  qe->buffers_dvma);
        free_netdev(dev);
        return res;
 }
-static int __devinit qec_sbus_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit qec_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        return qec_ether_init(op);
-        return qec_ether_init(sdev);
 }
-static int __devexit qec_sbus_remove(struct of_device *dev)
+static int __devexit qec_sbus_remove(struct of_device *op)
 {
-        struct sunqe *qp = dev_get_drvdata(&dev->dev);
+        struct sunqe *qp = dev_get_drvdata(&op->dev);
        struct net_device *net_dev = qp->dev;
        unregister_netdev(net_dev);
-        sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
+        of_iounmap(&op->resource[0], qp->qcregs, CREG_REG_SIZE);
-        sbus_iounmap(qp->mregs, MREGS_REG_SIZE);
+        of_iounmap(&op->resource[1], qp->mregs, MREGS_REG_SIZE);
-        sbus_free_consistent(qp->qe_sdev,
+        dma_free_coherent(&op->dev, PAGE_SIZE,
-                             PAGE_SIZE,
+                          qp->qe_block, qp->qblock_dvma);
-                             qp->qe_block,
+        dma_free_coherent(&op->dev, sizeof(struct sunqe_buffers),
-                             qp->qblock_dvma);
+                          qp->buffers, qp->buffers_dvma);
-        sbus_free_consistent(qp->qe_sdev,
-                             sizeof(struct sunqe_buffers),
-                             qp->buffers,
-                             qp->buffers_dvma);
        free_netdev(net_dev);
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id qec_sbus_match[] = {
+static const struct of_device_id qec_sbus_match[] = {
        {
                .name = "qe",
        },
@@ -991,7 +983,7 @@ static struct of_platform_driver qec_sbus_driver = {
 static int __init qec_init(void)
 {
-        return of_register_driver(&qec_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&qec_sbus_driver, &of_bus_type);
 }
 static void __exit qec_exit(void)
@@ -1000,11 +992,11 @@ static void __exit qec_exit(void)
        while (root_qec_dev) {
                struct sunqec *next = root_qec_dev->next_module;
+                struct of_device *op = root_qec_dev->op;
-                free_irq(root_qec_dev->qec_sdev->irqs[0],
+                free_irq(op->irqs[0], (void *) root_qec_dev);
-                         (void *) root_qec_dev);
+                of_iounmap(&op->resource[0], root_qec_dev->gregs,
-                sbus_iounmap(root_qec_dev->gregs, GLOB_REG_SIZE);
+                           GLOB_REG_SIZE);
                kfree(root_qec_dev);
                root_qec_dev = next;
diff --git a/drivers/net/sunqe.h b/drivers/net/sunqe.h
index 347c8ddc1592..5813a7b2faa5 100644
--- a/drivers/net/sunqe.h
+++ b/drivers/net/sunqe.h
@@ -314,7 +314,7 @@ struct sunqec {
        void __iomem            *gregs;         /* QEC Global Registers         */
        struct sunqe            *qes[4];        /* Each child MACE              */
        unsigned int            qec_bursts;     /* Support burst sizes          */
-        struct sbus_dev         *qec_sdev;      /* QEC's SBUS device            */
+        struct of_device        *op;            /* QEC's OF device              */
        struct sunqec           *next_module;   /* List of all QECs in system   */
 };
@@ -342,7 +342,7 @@ struct sunqe {
        __u32                           buffers_dvma;   /* DVMA visible address.       */
        struct sunqec                   *parent;
        u8                              mconfig;        /* Base MACE mconfig value     */
-        struct sbus_dev                 *qe_sdev;       /* QE's SBUS device struct     */
+        struct of_device                *op;            /* QE's OF device struct       */
        struct net_device               *dev;           /* QE's netdevice struct       */
        int                             channel;        /* Who am I?                   */
 };
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index 6415ce15c2ef..a720065553df 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -1,6 +1,6 @@
 /* sunvnet.c: Sun LDOM Virtual Network Driver.
 *
- * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
 */
 #include <linux/module.h>
@@ -1260,7 +1260,7 @@ static int vnet_port_remove(struct vio_dev *vdev)
        return 0;
 }
-static struct vio_device_id vnet_port_match[] = {
+static const struct vio_device_id vnet_port_match[] = {
        {
                .type = "vnet-port",
        },
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 2ae2ec40015d..21efd99b9294 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -205,7 +205,7 @@ config WANXL_BUILD_FIRMWARE
 config PC300
        tristate "Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)"
-        depends on HDLC && PCI
+        depends on HDLC && PCI && BROKEN
        ---help---
          Driver for the Cyclades-PC300 synchronous communication boards.
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index fd72e427cb28..27696c20f4c2 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -206,126 +206,123 @@ static void airo_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int airo_cs_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        win_req_t *req = priv_data;
+        if (cfg->index == 0)
+                return -ENODEV;
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+        /* This reserves IO space but doesn't actually enable it */
+        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                return -ENODEV;
+        /*
+          Now set up a common memory window, if needed.  There is room
+          in the struct pcmcia_device structure for one memory window handle,
+          but if the base addresses need to be saved, or if multiple
+          windows are needed, the info should go in the private data
+          structure for this device.
+          Note that the memory window base is a physical address, and
+          needs to be mapped to virtual space with ioremap() before it
+          is used.
+        */
+        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+                memreq_t map;
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
+                        return -ENODEV;
+                map.Page = 0;
+                map.CardOffset = mem->win[0].card_addr;
+                if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
+                        return -ENODEV;
+        }
+        /* If we got this far, we're cool! */
+        return 0;
+}
 static int airo_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
        local_info_t *dev;
+        win_req_t *req;
        int last_fn, last_ret;
-        u_char buf[64];
-        win_req_t req;
-        memreq_t map;
        dev = link->priv;
        DEBUG(0, "airo_config(0x%p)\n", link);
+        req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+        if (!req)
+                return -ENOMEM;
+        /*
+         * In this loop, we scan the CIS for configuration table
+         * entries, each of which describes a valid card
+         * configuration, including voltage, IO window, memory window,
+         * and interrupt settings.
+         *
+         * We make no assumptions about the card to be configured: we
+         * use just the information available in the CIS.  In an ideal
+         * world, this would work for any PCMCIA card, but it requires
+         * a complete and accurate CIS.  In practice, a driver usually
+         * "knows" most of these things without consulting the CIS,
+         * and most client drivers will only use the CIS to fill in
+         * implementation-defined details.
+         */
+        last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);
+        if (last_ret)
+                goto failed;
        /*
-          In this loop, we scan the CIS for configuration table entries,
+          Allocate an interrupt line.  Note that this does not assign a
-          each of which describes a valid card configuration, including
+          handler to the interrupt, unless the 'Handler' member of the
-          voltage, IO window, memory window, and interrupt settings.
+          irq structure is initialized.
-          
-          We make no assumptions about the card to be configured: we use
-          just the information available in the CIS.  In an ideal world,
-          this would work for any PCMCIA card, but it requires a complete
-          and accurate CIS.  In practice, a driver usually "knows" most of
-          these things without consulting the CIS, and most client drivers
-          will only use the CIS to fill in implementation-defined details.
        */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-                
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-                
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-                
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                
-                /*
-                  Now set up a common memory window, if needed.  There is room
-                  in the struct pcmcia_device structure for one memory window handle,
-                  but if the base addresses need to be saved, or if multiple
-                  windows are needed, the info should go in the private data
-                  structure for this device.
-                  
-                  Note that the memory window base is a physical address, and
-                  needs to be mapped to virtual space with ioremap() before it
-                  is used.
-                */
-                if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
-                        cistpl_mem_t *mem =
-                                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
-                        req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                        req.Base = mem->win[0].host_addr;
-                        req.Size = mem->win[0].len;
-                        req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
-                                goto next_entry;
-                        map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-                        if (pcmcia_map_mem_page(link->win, &map) != 0)
-                                goto next_entry;
-                }
-                /* If we got this far, we're cool! */
-                break;
-                
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
-        
-    /*
-      Allocate an interrupt line.  Note that this does not assign a
-      handler to the interrupt, unless the 'Handler' member of the
-      irq structure is initialized.
-    */
        if (link->conf.Attributes & CONF_ENABLE_IRQ)
                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
        
@@ -362,14 +359,17 @@ static int airo_config(struct pcmcia_device *link)
                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                       link->io.BasePort2+link->io.NumPorts2-1);
        if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
+                printk(", mem 0x%06lx-0x%06lx", req->Base,
-                       req.Base+req.Size-1);
+                       req->Base+req->Size-1);
        printk("\n");
+        kfree(req);
        return 0;
 cs_failed:
        cs_error(link, last_fn, last_ret);
+ failed:
        airo_release(link);
+        kfree(req);
        return -ENODEV;
 } /* airo_config */
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index d2388e8d179a..77406245dc7b 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -224,13 +224,58 @@ static int card_present(void *arg)
        return 0;
 }
+static int atmel_config_check(struct pcmcia_device *p_dev,
+                              cistpl_cftable_entry_t *cfg,
+                              cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
+                              void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int atmel_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
        local_info_t *dev;
        int last_fn, last_ret;
-        u_char buf[64];
        struct pcmcia_device_id *did;
        dev = link->priv;
@@ -238,11 +283,6 @@ static int atmel_config(struct pcmcia_device *link)
        DEBUG(0, "atmel_config(0x%p)\n", link);
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
        /*
          In this loop, we scan the CIS for configuration table entries,
          each of which describes a valid card configuration, including
@@ -255,66 +295,8 @@ static int atmel_config(struct pcmcia_device *link)
          these things without consulting the CIS, and most client drivers
          will only use the CIS to fill in implementation-defined details.
        */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        if (pcmcia_loop_config(link, atmel_config_check, NULL))
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+                goto failed;
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                /* If we got this far, we're cool! */
-                break;
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
        /*
          Allocate an interrupt line.  Note that this does not assign a
@@ -360,6 +342,7 @@ static int atmel_config(struct pcmcia_device *link)
 cs_failed:
        cs_error(link, last_fn, last_ret);
+ failed:
        atmel_release(link);
        return -ENODEV;
 }
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index b8aa16307f79..3cfc30307a27 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -82,13 +82,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        tuple.TupleOffset = 0;
        res = pcmcia_get_first_tuple(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_kfree_ssb;
        res = pcmcia_get_tuple_data(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_kfree_ssb;
-        res = pcmcia_parse_tuple(dev, &tuple, &parse);
+        res = pcmcia_parse_tuple(&tuple, &parse);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_kfree_ssb;
        dev->conf.ConfigBase = parse.config.base;
@@ -107,13 +107,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        win.Size = SSB_CORE_SIZE;
        win.AccessSpeed = 250;
        res = pcmcia_request_window(&dev, &win, &dev->win);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_kfree_ssb;
        mem.CardOffset = 0;
        mem.Page = 0;
        res = pcmcia_map_mem_page(dev->win, &mem);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_disable;
        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
@@ -121,11 +121,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        dev->irq.Handler = NULL; /* The handler is registered later. */
        dev->irq.Instance = NULL;
        res = pcmcia_request_irq(dev, &dev->irq);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_disable;
        res = pcmcia_request_configuration(dev, &dev->conf);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                goto err_disable;
        err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3b4e55cf33cd..633740277352 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -234,7 +234,7 @@ static void sandisk_set_iobase(local_info_t *local)
        reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
                       " res=%d\n", res);
        }
@@ -246,7 +246,7 @@ static void sandisk_set_iobase(local_info_t *local)
        reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
                       " res=%d\n", res);
        }
@@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
        tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
        if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
            pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
+            pcmcia_parse_tuple(&tuple, parse) ||
                parse->longlink_mfc.nfn < 2) {
                /* No multi-function links found */
                ret = -ENODEV;
@@ -322,7 +322,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
        reg.Value = COR_SOFT_RESET;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                       dev->name, res);
                goto done;
@@ -339,7 +339,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
        reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                       dev->name, res);
                goto done;
@@ -374,7 +374,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
        reg.Value = 0;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
                       res);
                return;
@@ -386,7 +386,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
        reg.Value |= COR_SOFT_RESET;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
                       res);
                return;
@@ -399,7 +399,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
                reg.Value |= COR_IREQ_ENA;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
                       res);
                return;
@@ -433,7 +433,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
        reg.Value = 0;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
                       "(%d)\n", res);
                return;
@@ -446,7 +446,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
        reg.Value |= COR_SOFT_RESET;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
                       "(%d)\n", res);
                return;
@@ -460,7 +460,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
        reg.Offset = CISREG_CCSR;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
                       "(%d)\n", res);
                return;
@@ -472,7 +472,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
        reg.Value = old_cor & ~COR_SOFT_RESET;
        res = pcmcia_access_configuration_register(hw_priv->link,
                                                   &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
                       "(%d)\n", res);
                return;
@@ -532,145 +532,118 @@ static void prism2_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-#define CFG_CHECK2(fn, retf) \
-do { int _ret = (retf); \
-if (_ret != 0) { \
-        PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \
-        cs_error(link, fn, _ret); \
-        goto next_entry; \
-} \
-} while (0)
 /* run after a CARD_INSERTION event is received to configure the PCMCIA
 * socket and make the device available to the system */
+static int prism2_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+        PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
+               "(default 0x%02X)\n", cfg->index, dflt->index);
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
+                               " this entry\n");
+                        return -ENODEV;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
+                               "- skipping this entry\n");
+                        return -ENODEV;
+                }
+        }
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        else if (!(p_dev->conf.Attributes & CONF_ENABLE_IRQ)) {
+                /* At least Compaq WL200 does not have IRQInfo1 set,
+                 * but it does not work without interrupts.. */
+                printk(KERN_WARNING "Config has no IRQ info, but trying to "
+                       "enable IRQ anyway..\n");
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        }
+        /* IO window settings */
+        PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
+               "dflt->io.nwin=%d\n",
+               cfg->io.nwin, dflt->io.nwin);
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
+                       "io.base=0x%04x, len=%d\n", io->flags,
+                       io->win[0].base, io->win[0].len);
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags &
+                        CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int prism2_config(struct pcmcia_device *link)
 {
        struct net_device *dev;
        struct hostap_interface *iface;
        local_info_t *local;
        int ret = 1;
-        tuple_t tuple;
-        cisparse_t *parse;
        int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        cistpl_cftable_entry_t dflt = { 0 };
        struct hostap_cs_priv *hw_priv;
        PDEBUG(DEBUG_FLOW, "prism2_config()\n");
-        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
        hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
-        if (parse == NULL || hw_priv == NULL) {
+        if (hw_priv == NULL) {
                ret = -ENOMEM;
                goto failed;
        }
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
        /* Look for an appropriate configuration table entry in the CIS */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        if (last_ret) {
-        for (;;) {
+                if (!ignore_cis_vcc)
-                cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
+                        printk(KERN_ERR "GetNextTuple(): No matching "
-                CFG_CHECK2(GetTupleData,
+                               "CIS configuration.  Maybe you need the "
-                           pcmcia_get_tuple_data(link, &tuple));
+                               "ignore_cis_vcc=1 parameter.\n");
-                CFG_CHECK2(ParseTuple,
+                cs_error(link, RequestIO, last_ret);
-                           pcmcia_parse_tuple(link, &tuple, parse));
+                goto failed;
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
-                       "(default 0x%02X)\n", cfg->index, dflt.index);
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
-                                       " this entry\n");
-                                goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
-                                       "- skipping this entry\n");
-                                goto next_entry;
-                        }
-                }
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                else if (!(link->conf.Attributes & CONF_ENABLE_IRQ)) {
-                        /* At least Compaq WL200 does not have IRQInfo1 set,
-                         * but it does not work without interrupts.. */
-                        printk("Config has no IRQ info, but trying to enable "
-                               "IRQ anyway..\n");
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                }
-                /* IO window settings */
-                PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
-                       "dflt.io.nwin=%d\n",
-                       cfg->io.nwin, dflt.io.nwin);
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
-                               "io.base=0x%04x, len=%d\n", io->flags,
-                               io->win[0].base, io->win[0].len);
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags &
-                                CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-                /* This reserves IO space but doesn't actually enable it */
-                CFG_CHECK2(RequestIO,
-                           pcmcia_request_io(link, &link->io));
-                /* This configuration table entry is OK */
-                break;
-        next_entry:
-                CS_CHECK(GetNextTuple,
-                         pcmcia_get_next_tuple(link, &tuple));
        }
        /* Need to allocate net_device before requesting IRQ handler */
@@ -738,14 +711,12 @@ static int prism2_config(struct pcmcia_device *link)
                if (ret == 0 && local->ddev)
                        strcpy(hw_priv->node.dev_name, local->ddev->name);
        }
-        kfree(parse);
        return ret;
 cs_failed:
        cs_error(link, last_fn, last_ret);
 failed:
-        kfree(parse);
        kfree(hw_priv);
        prism2_release((u_long)link);
        return ret;
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index e3505c110af6..842a08d1f106 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -791,7 +791,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
        if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
            (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
-            (ret = pcmcia_parse_tuple(p_dev, &tuple, &parse)) != 0)
+            (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
        {
                lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
                goto out1;
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 25bae7933aa5..a670f36b5f3f 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -749,9 +749,10 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
    for (i = j = 0x0; j < 0x400; j += 0x20) {
        link->io.BasePort1 = j ^ 0x300;
        i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
    }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
        cs_error(link, RequestIO, i);
        goto failed;
    }
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 9eaa252c2430..e585684e59a0 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -80,7 +80,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
        /* We need atomic ops here, because we're not holding the lock */
        set_bit(0, &card->hard_reset_in_progress);
-        err = pcmcia_reset_card(link, NULL);
+        err = pcmcia_reset_card(link->socket);
        if (err)
                return err;
@@ -165,6 +165,70 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
                last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
        } while (0)
+static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
 static int
 orinoco_cs_config(struct pcmcia_device *link)
 {
@@ -173,16 +237,8 @@ orinoco_cs_config(struct pcmcia_device *link)
        struct orinoco_pccard *card = priv->card;
        hermes_t *hw = &priv->hw;
        int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
        void __iomem *mem;
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
        /*
         * In this loop, we scan the CIS for configuration table
         * entries, each of which describes a valid card
@@ -197,94 +253,14 @@ orinoco_cs_config(struct pcmcia_device *link)
         * and most client drivers will only use the CIS to fill in
         * implementation-defined details.
         */
-        tuple.Attributes = 0;
+        last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
-        tuple.TupleData = buf;
+        if (last_ret) {
-        tuple.TupleDataMax = sizeof(buf);
+                if (!ignore_cis_vcc)
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-                /* If we got this far, we're cool! */
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
                        printk(KERN_ERR PFX "GetNextTuple(): No matching "
                               "CIS configuration.  Maybe you need the "
                               "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
+                cs_error(link, RequestIO, last_ret);
-                }
+                goto failed;
        }
        /*
@@ -335,7 +311,6 @@ orinoco_cs_config(struct pcmcia_device *link)
               "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
               link->irq.AssignedIRQ, link->io.BasePort1,
               link->io.BasePort1 + link->io.NumPorts1 - 1);
        return 0;
 cs_failed:
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 44da0d19b5c8..1404a5717520 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -798,9 +798,9 @@ static void ray_release(struct pcmcia_device *link)
    iounmap(local->amem);
    /* Do bother checking to see if these succeed or not */
    i = pcmcia_release_window(local->amem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
    i = pcmcia_release_window(local->rmem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
    pcmcia_disable_device(link);
    DEBUG(2,"ray_release ending\n");
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 67b26d3c3cd5..b0c71c3be467 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -235,6 +235,70 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
 * device available to the system.
 */
+static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
+                                    cistpl_cftable_entry_t *cfg,
+                                    cistpl_cftable_entry_t *dflt,
+                                    unsigned int vcc,
+                                    void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
 static int
 spectrum_cs_config(struct pcmcia_device *link)
 {
@@ -243,16 +307,8 @@ spectrum_cs_config(struct pcmcia_device *link)
        struct orinoco_pccard *card = priv->card;
        hermes_t *hw = &priv->hw;
        int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
        void __iomem *mem;
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
        /*
         * In this loop, we scan the CIS for configuration table
         * entries, each of which describes a valid card
@@ -267,94 +323,14 @@ spectrum_cs_config(struct pcmcia_device *link)
         * and most client drivers will only use the CIS to fill in
         * implementation-defined details.
         */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
-        tuple.Attributes = 0;
+        if (last_ret) {
-        tuple.TupleData = buf;
+                if (!ignore_cis_vcc)
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-                /* If we got this far, we're cool! */
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
                        printk(KERN_ERR PFX "GetNextTuple(): No matching "
                               "CIS configuration.  Maybe you need the "
                               "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
+                cs_error(link, RequestIO, last_ret);
-                }
+                goto failed;
        }
        /*
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index b5de38a9b791..e124b1d6267a 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3702,7 +3702,7 @@ wv_pcmcia_reset(struct net_device *	dev)
 #endif
  i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
    {
      cs_error(link, AccessConfigurationRegister, i);
      return FALSE;
@@ -3716,7 +3716,7 @@ wv_pcmcia_reset(struct net_device *	dev)
  reg.Action = CS_WRITE;
  reg.Value = reg.Value | COR_SW_RESET;
  i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
    {
      cs_error(link, AccessConfigurationRegister, i);
      return FALSE;
@@ -3725,7 +3725,7 @@ wv_pcmcia_reset(struct net_device *	dev)
  reg.Action = CS_WRITE;
  reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
  i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
    {
      cs_error(link, AccessConfigurationRegister, i);
      return FALSE;
@@ -3903,7 +3903,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
  do
    {
      i = pcmcia_request_io(link, &link->io);
-      if(i != CS_SUCCESS)
+      if (i != 0)
        {
          cs_error(link, RequestIO, i);
          break;
@@ -3914,7 +3914,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
       * actually assign a handler to the interrupt.
       */
      i = pcmcia_request_irq(link, &link->irq);
-      if(i != CS_SUCCESS)
+      if (i != 0)
        {
          cs_error(link, RequestIRQ, i);
          break;
@@ -3926,7 +3926,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
       */
      link->conf.ConfigIndex = 1;
      i = pcmcia_request_configuration(link, &link->conf);
-      if(i != CS_SUCCESS)
+      if (i != 0)
        {
          cs_error(link, RequestConfiguration, i);
          break;
@@ -3942,7 +3942,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
      req.Base = req.Size = 0;
      req.AccessSpeed = mem_speed;
      i = pcmcia_request_window(&link, &req, &link->win);
-      if(i != CS_SUCCESS)
+      if (i != 0)
        {
          cs_error(link, RequestWindow, i);
          break;
@@ -3954,7 +3954,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
      mem.CardOffset = 0; mem.Page = 0;
      i = pcmcia_map_mem_page(link->win, &mem);
-      if(i != CS_SUCCESS)
+      if (i != 0)
        {
          cs_error(link, MapMemPage, i);
          break;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 74a5ad2f1223..68789c6e1ce9 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1977,10 +1977,10 @@ static int wl3501_config(struct pcmcia_device *link)
                link->io.BasePort1 = j;
                link->io.BasePort2 = link->io.BasePort1 + 0x10;
                i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS)
+                if (i == 0)
                        break;
        }
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                cs_error(link, RequestIO, i);
                goto failed;
        }
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index c749bdba214c..3c3dd403f5dd 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1794,10 +1794,10 @@ static struct xenbus_driver netfront = {
 static int __init netif_init(void)
 {
-        if (!is_running_on_xen())
+        if (!xen_domain())
                return -ENODEV;
-        if (is_initial_xendomain())
+        if (xen_initial_domain())
                return 0;
        printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
@@ -1809,7 +1809,7 @@ module_init(netif_init);
 static void __exit netif_exit(void)
 {
-        if (is_initial_xendomain())
+        if (xen_initial_domain())
                return;
        xenbus_unregister_driver(&netfront);