Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

5 files changed, 184 insertions, 325 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index c250a31efa5..2db4c0a29b0 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -23,8 +23,6 @@
   * All rights reserved. Licensed under dual BSD/GPL license.
   */
 
-/* #define PCMCIA_DEBUG 6 */
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -47,18 +45,17 @@
 
 /* #define ATR_CSUM */
 
-#ifdef PCMCIA_DEBUG
-#define reader_to_dev(x)        (&handle_to_dev(x->p_dev))
-static int pc_debug = PCMCIA_DEBUG;
-module_param(pc_debug, int, 0600);
-#define DEBUGP(n, rdr, x, args...) do {                                 \
-        if (pc_debug >= (n))                                            \
-                dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x,     \
-                           __func__ , ## args);                 \
+#define reader_to_dev(x)        (&x->p_dev->dev)
+
+/* n (debug level) is ignored */
+/* additional debug output may be enabled by re-compiling with
+ * CM4000_DEBUG set */
+/* #define CM4000_DEBUG */
+#define DEBUGP(n, rdr, x, args...) do {                 \
+                dev_dbg(reader_to_dev(rdr), "%s:" x,    \
+                           __func__ , ## args);         \
         } while (0)
-#else
-#define DEBUGP(n, rdr, x, args...)
-#endif
+
 static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
 
 #define T_1SEC          (HZ)
@@ -174,14 +171,13 @@ static unsigned char fi_di_table[10][14] = {
 /* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
 };
 
-#ifndef PCMCIA_DEBUG
+#ifndef CM4000_DEBUG
 #define xoutb   outb
 #define xinb    inb
 #else
 static inline void xoutb(unsigned char val, unsigned short port)
 {
-        if (pc_debug >= 7)
-                printk(KERN_DEBUG "outb(val=%.2x,port=%.4x)\n", val, port);
+        pr_debug("outb(val=%.2x,port=%.4x)\n", val, port);
         outb(val, port);
 }
 static inline unsigned char xinb(unsigned short port)
@@ -189,8 +185,7 @@ static inline unsigned char xinb(unsigned short port)
         unsigned char val;
 
         val = inb(port);
-        if (pc_debug >= 7)
-                printk(KERN_DEBUG "%.2x=inb(%.4x)\n", val, port);
+        pr_debug("%.2x=inb(%.4x)\n", val, port);
 
         return val;
 }
@@ -514,12 +509,10 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)
         for (i = 0; i < 4; i++) {
                 xoutb(i, REG_BUF_ADDR(iobase));
                 xoutb(dev->pts[i], REG_BUF_DATA(iobase));       /* buf data */
-#ifdef PCMCIA_DEBUG
-                if (pc_debug >= 5)
-                        printk("0x%.2x ", dev->pts[i]);
+#ifdef CM4000_DEBUG
+                pr_debug("0x%.2x ", dev->pts[i]);
         }
-        if (pc_debug >= 5)
-                printk("\n");
+        pr_debug("\n");
 #else
         }
 #endif
@@ -579,14 +572,13 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq)
                 pts_reply[i] = inb(REG_BUF_DATA(iobase));
         }
 
-#ifdef PCMCIA_DEBUG
+#ifdef CM4000_DEBUG
         DEBUGP(2, dev, "PTSreply: ");
         for (i = 0; i < num_bytes_read; i++) {
-                if (pc_debug >= 5)
-                        printk("0x%.2x ", pts_reply[i]);
+                pr_debug("0x%.2x ", pts_reply[i]);
         }
-        printk("\n");
-#endif  /* PCMCIA_DEBUG */
+        pr_debug("\n");
+#endif  /* CM4000_DEBUG */
 
         DEBUGP(5, dev, "Clear Tactive in Flags1\n");
         xoutb(0x20, REG_FLAGS1(iobase));
@@ -655,7 +647,7 @@ static void terminate_monitor(struct cm4000_dev *dev)
 
         DEBUGP(5, dev, "Delete timer\n");
         del_timer_sync(&dev->timer);
-#ifdef PCMCIA_DEBUG
+#ifdef CM4000_DEBUG
         dev->monitor_running = 0;
 #endif
 
@@ -898,7 +890,7 @@ static void monitor_card(unsigned long p)
                                 DEBUGP(4, dev, "ATR checksum (0x%.2x, should "
                                        "be zero) failed\n", dev->atr_csum);
                         }
-#ifdef PCMCIA_DEBUG
+#ifdef CM4000_DEBUG
                         else if (test_bit(IS_BAD_LENGTH, &dev->flags)) {
                                 DEBUGP(4, dev, "ATR length error\n");
                         } else {
@@ -1415,7 +1407,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         int size;
         int rc;
         void __user *argp = (void __user *)arg;
-#ifdef PCMCIA_DEBUG
+#ifdef CM4000_DEBUG
         char *ioctl_names[CM_IOC_MAXNR + 1] = {
                 [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS",
                 [_IOC_NR(CM_IOCGATR)] "CM_IOCGATR",
@@ -1423,9 +1415,9 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 [_IOC_NR(CM_IOCSPTS)] "CM_IOCSPTS",
                 [_IOC_NR(CM_IOSDBGLVL)] "CM4000_DBGLVL",
         };
-#endif
         DEBUGP(3, dev, "cmm_ioctl(device=%d.%d) %s\n", imajor(inode),
                iminor(inode), ioctl_names[_IOC_NR(cmd)]);
+#endif
 
         lock_kernel();
         rc = -ENODEV;
@@ -1523,7 +1515,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 }
         case CM_IOCARDOFF:
 
-#ifdef PCMCIA_DEBUG
+#ifdef CM4000_DEBUG
                 DEBUGP(4, dev, "... in CM_IOCARDOFF\n");
                 if (dev->flags0 & 0x01) {
                         DEBUGP(4, dev, "    Card inserted\n");
@@ -1625,18 +1617,9 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
                 }
                 break;
-#ifdef PCMCIA_DEBUG
-        case CM_IOSDBGLVL:      /* set debug log level */
-                {
-                        int old_pc_debug = 0;
-
-                        old_pc_debug = pc_debug;
-                        if (copy_from_user(&pc_debug, argp, sizeof(int)))
-                                rc = -EFAULT;
-                        else if (old_pc_debug != pc_debug)
-                                DEBUGP(0, dev, "Changed debug log level "
-                                       "to %i\n", pc_debug);
-                }
+#ifdef CM4000_DEBUG
+        case CM_IOSDBGLVL:
+                rc = -ENOTTY;
                 break;
 #endif
         default:
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 4f0723b0797..a6a70e476be 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -17,8 +17,6 @@
  * All rights reserved, Dual BSD/GPL Licensed.
  */
 
-/* #define PCMCIA_DEBUG 6 */
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -41,18 +39,16 @@
 #include "cm4040_cs.h"
 
 
-#ifdef PCMCIA_DEBUG
-#define reader_to_dev(x)        (&handle_to_dev(x->p_dev))
-static int pc_debug = PCMCIA_DEBUG;
-module_param(pc_debug, int, 0600);
-#define DEBUGP(n, rdr, x, args...) do {                                 \
-        if (pc_debug >= (n))                                            \
-                dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x,     \
-                           __func__ , ##args);                  \
+#define reader_to_dev(x)        (&x->p_dev->dev)
+
+/* n (debug level) is ignored */
+/* additional debug output may be enabled by re-compiling with
+ * CM4040_DEBUG set */
+/* #define CM4040_DEBUG */
+#define DEBUGP(n, rdr, x, args...) do {                 \
+                dev_dbg(reader_to_dev(rdr), "%s:" x,    \
+                           __func__ , ## args);         \
         } while (0)
-#else
-#define DEBUGP(n, rdr, x, args...)
-#endif
 
 static char *version =
 "OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
@@ -90,14 +86,13 @@ struct reader_dev {
 
 static struct pcmcia_device *dev_table[CM_MAX_DEV];
 
-#ifndef PCMCIA_DEBUG
+#ifndef CM4040_DEBUG
 #define xoutb   outb
 #define xinb    inb
 #else
 static inline void xoutb(unsigned char val, unsigned short port)
 {
-        if (pc_debug >= 7)
-                printk(KERN_DEBUG "outb(val=%.2x,port=%.4x)\n", val, port);
+        pr_debug("outb(val=%.2x,port=%.4x)\n", val, port);
         outb(val, port);
 }
 
@@ -106,8 +101,7 @@ static inline unsigned char xinb(unsigned short port)
         unsigned char val;
 
         val = inb(port);
-        if (pc_debug >= 7)
-                printk(KERN_DEBUG "%.2x=inb(%.4x)\n", val, port);
+        pr_debug("%.2x=inb(%.4x)\n", val, port);
         return val;
 }
 #endif
@@ -260,23 +254,22 @@ static ssize_t cm4040_read(struct file *filp, char __user *buf,
                         return -EIO;
                 }
                 dev->r_buf[i] = xinb(iobase + REG_OFFSET_BULK_IN);
-#ifdef PCMCIA_DEBUG
-                if (pc_debug >= 6)
-                        printk(KERN_DEBUG "%lu:%2x ", i, dev->r_buf[i]);
+#ifdef CM4040_DEBUG
+                pr_debug("%lu:%2x ", i, dev->r_buf[i]);
         }
-        printk("\n");
+        pr_debug("\n");
 #else
         }
 #endif
 
         bytes_to_read = 5 + le32_to_cpu(*(__le32 *)&dev->r_buf[1]);
 
-        DEBUGP(6, dev, "BytesToRead=%lu\n", bytes_to_read);
+        DEBUGP(6, dev, "BytesToRead=%zu\n", bytes_to_read);
 
         min_bytes_to_read = min(count, bytes_to_read + 5);
         min_bytes_to_read = min_t(size_t, min_bytes_to_read, READ_WRITE_BUFFER_SIZE);
 
-        DEBUGP(6, dev, "Min=%lu\n", min_bytes_to_read);
+        DEBUGP(6, dev, "Min=%zu\n", min_bytes_to_read);
 
         for (i = 0; i < (min_bytes_to_read-5); i++) {
                 rc = wait_for_bulk_in_ready(dev);
@@ -288,11 +281,10 @@ static ssize_t cm4040_read(struct file *filp, char __user *buf,
                         return -EIO;
                 }
                 dev->r_buf[i+5] = xinb(iobase + REG_OFFSET_BULK_IN);
-#ifdef PCMCIA_DEBUG
-                if (pc_debug >= 6)
-                        printk(KERN_DEBUG "%lu:%2x ", i, dev->r_buf[i]);
+#ifdef CM4040_DEBUG
+                pr_debug("%lu:%2x ", i, dev->r_buf[i]);
         }
-        printk("\n");
+        pr_debug("\n");
 #else
         }
 #endif
@@ -547,7 +539,7 @@ static int cm4040_config_check(struct pcmcia_device *p_dev,
         p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
 
         rc = pcmcia_request_io(p_dev, &p_dev->io);
-        dev_printk(KERN_INFO, &handle_to_dev(p_dev),
+        dev_printk(KERN_INFO, &p_dev->dev,
                    "pcmcia_request_io returned 0x%x\n", rc);
         return rc;
 }
@@ -569,7 +561,7 @@ static int reader_config(struct pcmcia_device *link, int devno)
 
         fail_rc = pcmcia_request_configuration(link, &link->conf);
         if (fail_rc != 0) {
-                dev_printk(KERN_INFO, &handle_to_dev(link),
+                dev_printk(KERN_INFO, &link->dev,
                            "pcmcia_request_configuration failed 0x%x\n",
                            fail_rc);
                 goto cs_release;
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 4c1820cad71..99cffdab105 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -1213,12 +1213,12 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
 
 irqreturn_t ipwireless_interrupt(int irq, void *dev_id)
 {
-        struct ipw_hardware *hw = dev_id;
+        struct ipw_dev *ipw = dev_id;
 
-        if (hw->hw_version == HW_VERSION_1)
-                return ipwireless_handle_v1_interrupt(irq, hw);
+        if (ipw->hardware->hw_version == HW_VERSION_1)
+                return ipwireless_handle_v1_interrupt(irq, ipw->hardware);
         else
-                return ipwireless_handle_v2_v3_interrupt(irq, hw);
+                return ipwireless_handle_v2_v3_interrupt(irq, ipw->hardware);
 }
 
 static void flush_packets_to_hw(struct ipw_hardware *hw)
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 5216fce0c62..dff24dae148 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -65,10 +65,7 @@ static void signalled_reboot_work(struct work_struct *work_reboot)
         struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,
                         work_reboot);
         struct pcmcia_device *link = ipw->link;
-        int ret = pcmcia_reset_card(link->socket);
-
-        if (ret != 0)
-                cs_error(link, ResetCard, ret);
+        pcmcia_reset_card(link->socket);
 }
 
 static void signalled_reboot_callback(void *callback_data)
@@ -79,208 +76,127 @@ static void signalled_reboot_callback(void *callback_data)
         schedule_work(&ipw->work_reboot);
 }
 
-static int config_ipwireless(struct ipw_dev *ipw)
+static int ipwireless_probe(struct pcmcia_device *p_dev,
+                            cistpl_cftable_entry_t *cfg,
+                            cistpl_cftable_entry_t *dflt,
+                            unsigned int vcc,
+                            void *priv_data)
 {
-        struct pcmcia_device *link = ipw->link;
-        int ret;
-        tuple_t tuple;
-        unsigned short buf[64];
-        cisparse_t parse;
-        unsigned short cor_value;
+        struct ipw_dev *ipw = priv_data;
+        struct resource *io_resource;
         memreq_t memreq_attr_memory;
         memreq_t memreq_common_memory;
+        int ret;
 
-        ipw->is_v2_card = 0;
-
-        tuple.Attributes = 0;
-        tuple.TupleData = (cisdata_t *) buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
-        tuple.DesiredTuple = RETURN_FIRST_TUPLE;
-
-        ret = pcmcia_get_first_tuple(link, &tuple);
-
-        while (ret == 0) {
-                ret = pcmcia_get_tuple_data(link, &tuple);
-
-                if (ret != 0) {
-                        cs_error(link, GetTupleData, ret);
-                        goto exit0;
-                }
-                ret = pcmcia_get_next_tuple(link, &tuple);
-        }
-
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
-        ret = pcmcia_get_first_tuple(link, &tuple);
-
-        if (ret != 0) {
-                cs_error(link, GetFirstTuple, ret);
-                goto exit0;
-        }
-
-        ret = pcmcia_get_tuple_data(link, &tuple);
-
-        if (ret != 0) {
-                cs_error(link, GetTupleData, ret);
-                goto exit0;
-        }
-
-        ret = pcmcia_parse_tuple(&tuple, &parse);
-
-        if (ret != 0) {
-                cs_error(link, ParseTuple, ret);
-                goto exit0;
-        }
-
-        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-        link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-        link->io.IOAddrLines = 16;
-
-        link->irq.IRQInfo1 = parse.cftable_entry.irq.IRQInfo1;
+        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        p_dev->io.IOAddrLines = 16;
 
         /* 0x40 causes it to generate level mode interrupts. */
         /* 0x04 enables IREQ pin. */
-        cor_value = parse.cftable_entry.index | 0x44;
-        link->conf.ConfigIndex = cor_value;
+        p_dev->conf.ConfigIndex = cfg->index | 0x44;
+        ret = pcmcia_request_io(p_dev, &p_dev->io);
+        if (ret)
+                return ret;
 
-        /* IRQ and I/O settings */
-        tuple.DesiredTuple = CISTPL_CONFIG;
+        io_resource = request_region(p_dev->io.BasePort1, p_dev->io.NumPorts1,
+                                IPWIRELESS_PCCARD_NAME);
 
-        ret = pcmcia_get_first_tuple(link, &tuple);
+        if (cfg->mem.nwin == 0)
+                return 0;
 
-        if (ret != 0) {
-                cs_error(link, GetFirstTuple, ret);
-                goto exit0;
-        }
+        ipw->request_common_memory.Attributes =
+                WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
+        ipw->request_common_memory.Base = cfg->mem.win[0].host_addr;
+        ipw->request_common_memory.Size = cfg->mem.win[0].len;
+        if (ipw->request_common_memory.Size < 0x1000)
+                ipw->request_common_memory.Size = 0x1000;
+        ipw->request_common_memory.AccessSpeed = 0;
 
-        ret = pcmcia_get_tuple_data(link, &tuple);
-
-        if (ret != 0) {
-                cs_error(link, GetTupleData, ret);
-                goto exit0;
-        }
+        ret = pcmcia_request_window(p_dev, &ipw->request_common_memory,
+                                &ipw->handle_common_memory);
 
-        ret = pcmcia_parse_tuple(&tuple, &parse);
+        if (ret != 0)
+                goto exit1;
 
-        if (ret != 0) {
-                cs_error(link, GetTupleData, ret);
-                goto exit0;
-        }
-        link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
-        link->conf.IntType = INT_MEMORY_AND_IO;
+        memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr;
+        memreq_common_memory.Page = 0;
 
-        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
-        link->irq.Handler = ipwireless_interrupt;
-        link->irq.Instance = ipw->hardware;
+        ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,
+                                &memreq_common_memory);
 
-        ret = pcmcia_request_io(link, &link->io);
+        if (ret != 0)
+                goto exit2;
 
-        if (ret != 0) {
-                cs_error(link, RequestIO, ret);
-                goto exit0;
-        }
+        ipw->is_v2_card = cfg->mem.win[0].len == 0x100;
 
-        request_region(link->io.BasePort1, link->io.NumPorts1,
+        ipw->common_memory = ioremap(ipw->request_common_memory.Base,
+                                ipw->request_common_memory.Size);
+        request_mem_region(ipw->request_common_memory.Base,
+                        ipw->request_common_memory.Size,
                         IPWIRELESS_PCCARD_NAME);
 
-        /* memory settings */
-
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
-        ret = pcmcia_get_first_tuple(link, &tuple);
-
-        if (ret != 0) {
-                cs_error(link, GetFirstTuple, ret);
-                goto exit1;
-        }
-
-        ret = pcmcia_get_tuple_data(link, &tuple);
+        ipw->request_attr_memory.Attributes =
+                WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE;
+        ipw->request_attr_memory.Base = 0;
+        ipw->request_attr_memory.Size = 0;      /* this used to be 0x1000 */
+        ipw->request_attr_memory.AccessSpeed = 0;
 
-        if (ret != 0) {
-                cs_error(link, GetTupleData, ret);
-                goto exit1;
-        }
-
-        ret = pcmcia_parse_tuple(&tuple, &parse);
-
-        if (ret != 0) {
-                cs_error(link, ParseTuple, ret);
-                goto exit1;
-        }
+        ret = pcmcia_request_window(p_dev, &ipw->request_attr_memory,
+                                &ipw->handle_attr_memory);
 
-        if (parse.cftable_entry.mem.nwin > 0) {
-                ipw->request_common_memory.Attributes =
-                        WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
-                ipw->request_common_memory.Base =
-                        parse.cftable_entry.mem.win[0].host_addr;
-                ipw->request_common_memory.Size = parse.cftable_entry.mem.win[0].len;
-                if (ipw->request_common_memory.Size < 0x1000)
-                        ipw->request_common_memory.Size = 0x1000;
-                ipw->request_common_memory.AccessSpeed = 0;
-
-                ret = pcmcia_request_window(&link, &ipw->request_common_memory,
-                                &ipw->handle_common_memory);
+        if (ret != 0)
+                goto exit2;
 
-                if (ret != 0) {
-                        cs_error(link, RequestWindow, ret);
-                        goto exit1;
-                }
+        memreq_attr_memory.CardOffset = 0;
+        memreq_attr_memory.Page = 0;
 
-                memreq_common_memory.CardOffset =
-                        parse.cftable_entry.mem.win[0].card_addr;
-                memreq_common_memory.Page = 0;
+        ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory,
+                                &memreq_attr_memory);
 
-                ret = pcmcia_map_mem_page(ipw->handle_common_memory,
-                                &memreq_common_memory);
+        if (ret != 0)
+                goto exit3;
 
-                if (ret != 0) {
-                        cs_error(link, MapMemPage, ret);
-                        goto exit1;
-                }
+        ipw->attr_memory = ioremap(ipw->request_attr_memory.Base,
+                                ipw->request_attr_memory.Size);
+        request_mem_region(ipw->request_attr_memory.Base,
+                        ipw->request_attr_memory.Size, IPWIRELESS_PCCARD_NAME);
 
-                ipw->is_v2_card =
-                        parse.cftable_entry.mem.win[0].len == 0x100;
+        return 0;
 
-                ipw->common_memory = ioremap(ipw->request_common_memory.Base,
+exit3:
+        pcmcia_release_window(p_dev, ipw->handle_attr_memory);
+exit2:
+        if (ipw->common_memory) {
+                release_mem_region(ipw->request_common_memory.Base,
                                 ipw->request_common_memory.Size);
-                request_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size, IPWIRELESS_PCCARD_NAME);
-
-                ipw->request_attr_memory.Attributes =
-                        WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE;
-                ipw->request_attr_memory.Base = 0;
-                ipw->request_attr_memory.Size = 0;      /* this used to be 0x1000 */
-                ipw->request_attr_memory.AccessSpeed = 0;
-
-                ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
-                                &ipw->handle_attr_memory);
+                iounmap(ipw->common_memory);
+                pcmcia_release_window(p_dev, ipw->handle_common_memory);
+        } else
+                pcmcia_release_window(p_dev, ipw->handle_common_memory);
+exit1:
+        release_resource(io_resource);
+        pcmcia_disable_device(p_dev);
+        return -1;
+}
 
-                if (ret != 0) {
-                        cs_error(link, RequestWindow, ret);
-                        goto exit2;
-                }
+static int config_ipwireless(struct ipw_dev *ipw)
+{
+        struct pcmcia_device *link = ipw->link;
+        int ret = 0;
 
-                memreq_attr_memory.CardOffset = 0;
-                memreq_attr_memory.Page = 0;
+        ipw->is_v2_card = 0;
 
-                ret = pcmcia_map_mem_page(ipw->handle_attr_memory,
-                                &memreq_attr_memory);
+        ret = pcmcia_loop_config(link, ipwireless_probe, ipw);
+        if (ret != 0)
+                return ret;
 
-                if (ret != 0) {
-                        cs_error(link, MapMemPage, ret);
-                        goto exit2;
-                }
+        link->conf.Attributes = CONF_ENABLE_IRQ;
+        link->conf.IntType = INT_MEMORY_AND_IO;
 
-                ipw->attr_memory = ioremap(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
-                request_mem_region(ipw->request_attr_memory.Base, ipw->request_attr_memory.Size,
-                                IPWIRELESS_PCCARD_NAME);
-        }
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
+        link->irq.Handler = ipwireless_interrupt;
 
         INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
 
@@ -291,10 +207,8 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_irq(link, &link->irq);
 
-        if (ret != 0) {
-                cs_error(link, RequestIRQ, ret);
-                goto exit3;
-        }
+        if (ret != 0)
+                goto exit;
 
         printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
                         ipw->is_v2_card ? "V2/V3" : "V1");
@@ -316,12 +230,12 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ipw->network = ipwireless_network_create(ipw->hardware);
         if (!ipw->network)
-                goto exit3;
+                goto exit;
 
         ipw->tty = ipwireless_tty_create(ipw->hardware, ipw->network,
                         ipw->nodes);
         if (!ipw->tty)
-                goto exit3;
+                goto exit;
 
         ipwireless_init_hardware_v2_v3(ipw->hardware);
 
@@ -331,35 +245,27 @@ static int config_ipwireless(struct ipw_dev *ipw)
          */
         ret = pcmcia_request_configuration(link, &link->conf);
 
-        if (ret != 0) {
-                cs_error(link, RequestConfiguration, ret);
-                goto exit4;
-        }
+        if (ret != 0)
+                goto exit;
 
         link->dev_node = &ipw->nodes[0];
 
         return 0;
 
-exit4:
-        pcmcia_disable_device(link);
-exit3:
+exit:
         if (ipw->attr_memory) {
                 release_mem_region(ipw->request_attr_memory.Base,
                                 ipw->request_attr_memory.Size);
                 iounmap(ipw->attr_memory);
-                pcmcia_release_window(ipw->handle_attr_memory);
-                pcmcia_disable_device(link);
+                pcmcia_release_window(link, ipw->handle_attr_memory);
         }
-exit2:
         if (ipw->common_memory) {
                 release_mem_region(ipw->request_common_memory.Base,
                                 ipw->request_common_memory.Size);
                 iounmap(ipw->common_memory);
-                pcmcia_release_window(ipw->handle_common_memory);
+                pcmcia_release_window(link, ipw->handle_common_memory);
         }
-exit1:
         pcmcia_disable_device(link);
-exit0:
         return -1;
 }
 
@@ -378,9 +284,9 @@ static void release_ipwireless(struct ipw_dev *ipw)
                 iounmap(ipw->attr_memory);
         }
         if (ipw->common_memory)
-                pcmcia_release_window(ipw->handle_common_memory);
+                pcmcia_release_window(ipw->link, ipw->handle_common_memory);
         if (ipw->attr_memory)
-                pcmcia_release_window(ipw->handle_attr_memory);
+                pcmcia_release_window(ipw->link, ipw->handle_attr_memory);
 
         /* Break the link with Card Services */
         pcmcia_disable_device(ipw->link);
@@ -406,7 +312,6 @@ static int ipwireless_attach(struct pcmcia_device *link)
 
         ipw->link = link;
         link->priv = ipw;
-        link->irq.Instance = ipw;
 
         /* Link this device into our device list. */
         link->dev_node = &ipw->nodes[0];
@@ -421,7 +326,6 @@ static int ipwireless_attach(struct pcmcia_device *link)
         ret = config_ipwireless(ipw);
 
         if (ret != 0) {
-                cs_error(link, RegisterClient, ret);
                 ipwireless_detach(link);
                 return ret;
         }
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index caf6e4d1946..c31a0d913d3 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -554,7 +554,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
 
     /* Interrupt setup */
     link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-    link->irq.IRQInfo1   = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 
     link->conf.Attributes = 0;
@@ -572,69 +571,51 @@ static int mgslpc_probe(struct pcmcia_device *link)
 /* Card has been inserted.
  */
 
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int mgslpc_ioprobe(struct pcmcia_device *p_dev,
+                          cistpl_cftable_entry_t *cfg,
+                          cistpl_cftable_entry_t *dflt,
+                          unsigned int vcc,
+                          void *priv_data)
+{
+        if (cfg->io.nwin > 0) {
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(cfg->io.flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(cfg->io.flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = cfg->io.win[0].base;
+                p_dev->io.NumPorts1 = cfg->io.win[0].len;
+                return pcmcia_request_io(p_dev, &p_dev->io);
+        }
+        return -ENODEV;
+}
 
 static int mgslpc_config(struct pcmcia_device *link)
 {
     MGSLPC_INFO *info = link->priv;
-    tuple_t tuple;
-    cisparse_t parse;
-    int last_fn, last_ret;
-    u_char buf[64];
-    cistpl_cftable_entry_t dflt = { 0 };
-    cistpl_cftable_entry_t *cfg;
+    int ret;
 
     if (debug_level >= DEBUG_LEVEL_INFO)
             printk("mgslpc_config(0x%p)\n", link);
 
-    tuple.Attributes = 0;
-    tuple.TupleData = buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-
-    /* get CIS configuration entry */
-
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-
-    cfg = &(parse.cftable_entry);
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
-
-    if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-    if (cfg->index == 0)
-            goto cs_failed;
-
-    link->conf.ConfigIndex = cfg->index;
-    link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-    /* IO window settings */
-    link->io.NumPorts1 = 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;
-            CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-    }
+    ret = pcmcia_loop_config(link, mgslpc_ioprobe, NULL);
+    if (ret != 0)
+            goto failed;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 8;
     link->conf.Present = PRESENT_OPTION;
 
-    link->irq.Attributes |= IRQ_HANDLE_PRESENT;
     link->irq.Handler     = mgslpc_isr;
-    link->irq.Instance    = info;
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
 
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+    ret = pcmcia_request_irq(link, &link->irq);
+    if (ret)
+            goto failed;
+    ret = pcmcia_request_configuration(link, &link->conf);
+    if (ret)
+            goto failed;
 
     info->io_base = link->io.BasePort1;
     info->irq_level = link->irq.AssignedIRQ;
@@ -654,8 +635,7 @@ static int mgslpc_config(struct pcmcia_device *link)
     printk("\n");
     return 0;
 
-cs_failed:
-    cs_error(link, last_fn, last_ret);
+failed:
     mgslpc_release((u_long)link);
     return -ENODEV;
 }