Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (22 commits)
  pcmcia: synclink_cs: fix information leak to userland
  pcmcia: don't call flush_scheduled_work() spuriously
  serial_cs: drop spurious flush_scheduled_work() call
  pcmcia/yenta: guide users in case of problems with O2-bridges
  pcmcia: fix unused function compile warning
  pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device
  pcmcia: add a few debug statements
  pcmcia: remove obsolete and wrong comments
  pcmcia: avoid messages on module (un)loading
  pcmcia: move driver name to struct pcmcia_driver
  pcmcia: remove the "Finally, report what we've done" message
  pcmcia: use autoconfiguration feature for ioports and iomem
  pcmcia: introduce autoconfiguration feature
  pcmcia: Documentation update
  pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
  pcmcia: move config_{base,index,regs} to struct pcmcia_device
  pcmcia: simplify IntType
  pcmcia: simplify Status, ExtStatus register access
  pcmcia: remove Pin, Copy configuration register access
  pcmcia: move Vpp setup to struct pcmcia_device
  ...

6 files changed, 62 insertions, 178 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index ec73d9f6d9ed..c7b482d15e2a 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -34,7 +34,6 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
@@ -55,8 +54,6 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
-
 #define T_1SEC          (HZ)
 #define T_10MSEC        msecs_to_jiffies(10)
 #define T_20MSEC        msecs_to_jiffies(20)
@@ -1742,20 +1739,8 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
 
 /*==== Interface to PCMCIA Layer =======================================*/
 
-static int cm4000_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
+static int cm4000_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
         return pcmcia_request_io(p_dev);
 }
 
@@ -1763,13 +1748,13 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
 {
         struct cm4000_dev *dev;
 
+        link->config_flags |= CONF_AUTO_SET_IO;
+
         /* read the config-tuples */
         if (pcmcia_loop_config(link, cm4000_config_check, NULL))
                 goto cs_release;
 
-        link->conf.IntType = 00000002;
-
-        if (pcmcia_request_configuration(link, &link->conf))
+        if (pcmcia_enable_device(link))
                 goto cs_release;
 
         dev = link->priv;
@@ -1829,7 +1814,6 @@ static int cm4000_probe(struct pcmcia_device *link)
 
         dev->p_dev = link;
         link->priv = dev;
-        link->conf.IntType = INT_MEMORY_AND_IO;
         dev_table[i] = link;
 
         init_waitqueue_head(&dev->devq);
@@ -1891,9 +1875,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4000_ids);
 
 static struct pcmcia_driver cm4000_driver = {
         .owner    = THIS_MODULE,
-        .drv      = {
-                .name = "cm4000_cs",
-                },
+        .name     = "cm4000_cs",
         .probe    = cm4000_probe,
         .remove   = cm4000_detach,
         .suspend  = cm4000_suspend,
@@ -1905,8 +1887,6 @@ static int __init cmm_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
-
         cmm_class = class_create(THIS_MODULE, "cardman_4000");
         if (IS_ERR(cmm_class))
                 return PTR_ERR(cmm_class);
@@ -1931,7 +1911,6 @@ static int __init cmm_init(void)
 
 static void __exit cmm_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&cm4000_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmm_class);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 815cde1d0570..bf2f046fc2c1 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -29,7 +29,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
@@ -49,9 +48,6 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version =
-"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
-
 #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT        (150*HZ)
 #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT       (35*HZ)
 #define CCID_DRIVER_MINIMUM_TIMEOUT             (3*HZ)
@@ -516,26 +512,9 @@ static void cm4040_reader_release(struct pcmcia_device *link)
         return;
 }
 
-static int cm4040_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
+static int cm4040_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        int rc;
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        /* Get the IOaddr */
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-        rc = pcmcia_request_io(p_dev);
-
-        dev_printk(KERN_INFO, &p_dev->dev,
-                   "pcmcia_request_io returned 0x%x\n", rc);
-        return rc;
+        return pcmcia_request_io(p_dev);
 }
 
 
@@ -544,15 +523,15 @@ static int reader_config(struct pcmcia_device *link, int devno)
         struct reader_dev *dev;
         int fail_rc;
 
+        link->config_flags |= CONF_AUTO_SET_IO;
+
         if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                 goto cs_release;
 
-        link->conf.IntType = 00000002;
-
-        fail_rc = pcmcia_request_configuration(link, &link->conf);
+        fail_rc = pcmcia_enable_device(link);
         if (fail_rc != 0) {
                 dev_printk(KERN_INFO, &link->dev,
-                           "pcmcia_request_configuration failed 0x%x\n",
+                           "pcmcia_enable_device failed 0x%x\n",
                            fail_rc);
                 goto cs_release;
         }
@@ -599,7 +578,6 @@ static int reader_probe(struct pcmcia_device *link)
         link->priv = dev;
         dev->p_dev = link;
 
-        link->conf.IntType = INT_MEMORY_AND_IO;
         dev_table[i] = link;
 
         init_waitqueue_head(&dev->devq);
@@ -662,9 +640,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4040_ids);
 
 static struct pcmcia_driver reader_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "cm4040_cs",
-        },
+        .name           = "cm4040_cs",
         .probe          = reader_probe,
         .remove         = reader_detach,
         .id_table       = cm4040_ids,
@@ -674,7 +650,6 @@ static int __init cm4040_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
         cmx_class = class_create(THIS_MODULE, "cardman_4040");
         if (IS_ERR(cmx_class))
                 return PTR_ERR(cmx_class);
@@ -699,7 +674,6 @@ static int __init cm4040_init(void)
 
 static void __exit cm4040_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&reader_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmx_class);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 67bdb05798b1..94b8eb4d691d 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -32,7 +32,6 @@
 #include <pcmcia/device_id.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/ds.h>
-#include <pcmcia/cs.h>
 
 static struct pcmcia_device_id ipw_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0100),
@@ -76,23 +75,18 @@ static void signalled_reboot_callback(void *callback_data)
         schedule_work(&ipw->work_reboot);
 }
 
-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)
+static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data)
 {
         struct ipw_dev *ipw = priv_data;
         struct resource *io_resource;
         int ret;
 
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
         p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
 
         /* 0x40 causes it to generate level mode interrupts. */
         /* 0x04 enables IREQ pin. */
-        p_dev->conf.ConfigIndex = cfg->index | 0x44;
+        p_dev->config_index |= 0x44;
         p_dev->io_lines = 16;
         ret = pcmcia_request_io(p_dev);
         if (ret)
@@ -102,65 +96,49 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
                                 resource_size(p_dev->resource[0]),
                                 IPWIRELESS_PCCARD_NAME);
 
-        if (cfg->mem.nwin == 0)
-                return 0;
-
-        ipw->request_common_memory.Attributes =
+        p_dev->resource[2]->flags |=
                 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_request_window(p_dev, &ipw->request_common_memory,
-                                &ipw->handle_common_memory);
 
+        ret = pcmcia_request_window(p_dev, p_dev->resource[2], 0);
         if (ret != 0)
                 goto exit1;
 
-        ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,
-                                cfg->mem.win[0].card_addr);
-
+        ret = pcmcia_map_mem_page(p_dev, p_dev->resource[2], p_dev->card_addr);
         if (ret != 0)
                 goto exit2;
 
-        ipw->is_v2_card = cfg->mem.win[0].len == 0x100;
+        ipw->is_v2_card = resource_size(p_dev->resource[2]) == 0x100;
 
-        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,
+        ipw->attr_memory = ioremap(p_dev->resource[2]->start,
+                                resource_size(p_dev->resource[2]));
+        request_mem_region(p_dev->resource[2]->start,
+                        resource_size(p_dev->resource[2]),
                         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(p_dev, &ipw->request_attr_memory,
-                                &ipw->handle_attr_memory);
-
+        p_dev->resource[3]->flags |= WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM |
+                                        WIN_ENABLE;
+        p_dev->resource[3]->end = 0; /* this used to be 0x1000 */
+        ret = pcmcia_request_window(p_dev, p_dev->resource[3], 0);
         if (ret != 0)
                 goto exit2;
 
-        ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, 0);
+        ret = pcmcia_map_mem_page(p_dev, p_dev->resource[3], 0);
         if (ret != 0)
                 goto exit3;
 
-        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->attr_memory = ioremap(p_dev->resource[3]->start,
+                                resource_size(p_dev->resource[3]));
+        request_mem_region(p_dev->resource[3]->start,
+                        resource_size(p_dev->resource[3]),
+                        IPWIRELESS_PCCARD_NAME);
 
         return 0;
 
 exit3:
 exit2:
         if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
+                release_mem_region(p_dev->resource[2]->start,
+                                resource_size(p_dev->resource[2]));
                 iounmap(ipw->common_memory);
         }
 exit1:
@@ -175,14 +153,13 @@ static int config_ipwireless(struct ipw_dev *ipw)
         int ret = 0;
 
         ipw->is_v2_card = 0;
+        link->config_flags |= CONF_AUTO_SET_IO | CONF_AUTO_SET_IOMEM |
+                CONF_ENABLE_IRQ;
 
         ret = pcmcia_loop_config(link, ipwireless_probe, ipw);
         if (ret != 0)
                 return ret;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
         INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
 
         ipwireless_init_hardware_v1(ipw->hardware, link->resource[0]->start,
@@ -201,13 +178,9 @@ static int config_ipwireless(struct ipw_dev *ipw)
                         (unsigned int) link->irq);
         if (ipw->attr_memory && ipw->common_memory)
                 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                        ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n",
-                        ipw->request_attr_memory.Base,
-                        ipw->request_attr_memory.Base
-                        + ipw->request_attr_memory.Size - 1,
-                        ipw->request_common_memory.Base,
-                        ipw->request_common_memory.Base
-                        + ipw->request_common_memory.Size - 1);
+                        ": attr memory %pR, common memory %pR\n",
+                        link->resource[3],
+                        link->resource[2]);
 
         ipw->network = ipwireless_network_create(ipw->hardware);
         if (!ipw->network)
@@ -223,25 +196,23 @@ static int config_ipwireless(struct ipw_dev *ipw)
          * Do the RequestConfiguration last, because it enables interrupts.
          * Then we don't get any interrupts before we're ready for them.
          */
-        ret = pcmcia_request_configuration(link, &link->conf);
-
+        ret = pcmcia_enable_device(link);
         if (ret != 0)
                 goto exit;
 
         return 0;
 
 exit:
-        if (ipw->attr_memory) {
-                release_mem_region(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
-                iounmap(ipw->attr_memory);
-
-        }
         if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
+                release_mem_region(link->resource[2]->start,
+                                resource_size(link->resource[2]));
                 iounmap(ipw->common_memory);
         }
+        if (ipw->attr_memory) {
+                release_mem_region(link->resource[3]->start,
+                                resource_size(link->resource[3]));
+                iounmap(ipw->attr_memory);
+        }
         pcmcia_disable_device(link);
         return -1;
 }
@@ -249,13 +220,13 @@ exit:
 static void release_ipwireless(struct ipw_dev *ipw)
 {
         if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
+                release_mem_region(ipw->link->resource[2]->start,
+                                resource_size(ipw->link->resource[2]));
                 iounmap(ipw->common_memory);
         }
         if (ipw->attr_memory) {
-                release_mem_region(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
+                release_mem_region(ipw->link->resource[3]->start,
+                                resource_size(ipw->link->resource[3]));
                 iounmap(ipw->attr_memory);
         }
         pcmcia_disable_device(ipw->link);
@@ -324,7 +295,7 @@ static struct pcmcia_driver me = {
         .owner          = THIS_MODULE,
         .probe          = ipwireless_attach,
         .remove         = ipwireless_detach,
-        .drv = { .name  = IPWIRELESS_PCCARD_NAME },
+        .name           = IPWIRELESS_PCCARD_NAME,
         .id_table       = ipw_ids
 };
 
@@ -336,9 +307,6 @@ static int __init init_ipwireless(void)
 {
         int ret;
 
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-               IPWIRELESS_PCMCIA_VERSION " by " IPWIRELESS_PCMCIA_AUTHOR "\n");
-
         ret = ipwireless_tty_init();
         if (ret != 0)
                 return ret;
@@ -355,9 +323,6 @@ static int __init init_ipwireless(void)
  */
 static void __exit exit_ipwireless(void)
 {
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-                        IPWIRELESS_PCMCIA_VERSION " removed\n");
-
         pcmcia_unregister_driver(&me);
         ipwireless_tty_release();
 }
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h
index c207be87b597..f2cbb116bccb 100644
--- a/drivers/char/pcmcia/ipwireless/main.h
+++ b/drivers/char/pcmcia/ipwireless/main.h
@@ -21,7 +21,6 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
@@ -45,13 +44,9 @@ struct ipw_dev {
         struct pcmcia_device *link;
         int is_v2_card;
 
-        window_handle_t handle_attr_memory;
         void __iomem *attr_memory;
-        win_req_t request_attr_memory;
 
-        window_handle_t handle_common_memory;
         void __iomem *common_memory;
-        win_req_t request_common_memory;
 
         /* Reference to attribute memory, containing CIS data */
         void *attribute_memory;
diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/char/pcmcia/ipwireless/tty.h
index 3e163d4cab15..747b2d637860 100644
--- a/drivers/char/pcmcia/ipwireless/tty.h
+++ b/drivers/char/pcmcia/ipwireless/tty.h
@@ -21,7 +21,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9ecd6bef5d3b..be1810057607 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -70,7 +70,6 @@
 #include <linux/workqueue.h>
 #include <linux/hdlc.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -550,9 +549,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
 
     /* Initialize the struct pcmcia_device structure */
 
-    link->conf.Attributes = 0;
-    link->conf.IntType = INT_MEMORY_AND_IO;
-
     ret = mgslpc_config(link);
     if (ret)
             return ret;
@@ -565,20 +561,8 @@ static int mgslpc_probe(struct pcmcia_device *link)
 /* Card has been inserted.
  */
 
-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)
+static int mgslpc_ioprobe(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
         return pcmcia_request_io(p_dev);
 }
 
@@ -590,32 +574,24 @@ static int mgslpc_config(struct pcmcia_device *link)
     if (debug_level >= DEBUG_LEVEL_INFO)
             printk("mgslpc_config(0x%p)\n", link);
 
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_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->config_index = 8;
+    link->config_regs = PRESENT_OPTION;
 
     ret = pcmcia_request_irq(link, mgslpc_isr);
     if (ret)
             goto failed;
-    ret = pcmcia_request_configuration(link, &link->conf);
+    ret = pcmcia_enable_device(link);
     if (ret)
             goto failed;
 
     info->io_base = link->resource[0]->start;
     info->irq_level = link->irq;
-
-    dev_info(&link->dev, "index 0x%02x:",
-            link->conf.ConfigIndex);
-    if (link->conf.Attributes & CONF_ENABLE_IRQ)
-            printk(", irq %d", link->irq);
-    if (link->resource[0])
-            printk(", io %pR", link->resource[0]);
-    printk("\n");
     return 0;
 
 failed:
@@ -2797,9 +2773,7 @@ MODULE_DEVICE_TABLE(pcmcia, mgslpc_ids);
 
 static struct pcmcia_driver mgslpc_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "synclink_cs",
-        },
+        .name           = "synclink_cs",
         .probe          = mgslpc_probe,
         .remove         = mgslpc_detach,
         .id_table       = mgslpc_ids,
@@ -2835,8 +2809,6 @@ static void synclink_cs_cleanup(void)
 {
         int rc;
 
-        printk("Unloading %s: version %s\n", driver_name, driver_version);
-
         while(mgslpc_device_list)
                 mgslpc_remove_device(mgslpc_device_list);
 
@@ -2859,8 +2831,6 @@ static int __init synclink_cs_init(void)
             BREAKPOINT();
     }
 
-    printk("%s %s\n", driver_name, driver_version);
-
     if ((rc = pcmcia_register_driver(&mgslpc_driver)) < 0)
             return rc;
 
@@ -4127,6 +4097,8 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (cmd != SIOCWANDEV)
                 return hdlc_ioctl(dev, ifr, cmd);
 
+        memset(&new_line, 0, size);
+
         switch(ifr->ifr_settings.type) {
         case IF_GET_IFACE: /* return current sync_serial_settings */