3 files changed, 10 insertions, 57 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 50d20aafeb18..211c93fda6fc 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1764,29 +1764,11 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
         int rc;
 
         /* read the config-tuples */
-        tuple.DesiredTuple = CISTPL_CONFIG;
         tuple.Attributes = 0;
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
 
-        if ((fail_rc = pcmcia_get_first_tuple(link, &tuple)) != CS_SUCCESS) {
-                fail_fn = GetFirstTuple;
-                goto cs_failed;
-        }
-        if ((fail_rc = pcmcia_get_tuple_data(link, &tuple)) != CS_SUCCESS) {
-                fail_fn = GetTupleData;
-                goto cs_failed;
-        }
-        if ((fail_rc =
-             pcmcia_parse_tuple(link, &tuple, &parse)) != CS_SUCCESS) {
-                fail_fn = ParseTuple;
-                goto cs_failed;
-        }
-
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
-
         link->io.BasePort2 = 0;
         link->io.NumPorts2 = 0;
         link->io.Attributes2 = 0;
@@ -1841,8 +1823,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
 
         return 0;
 
-cs_failed:
-        cs_error(link, fail_fn, fail_rc);
 cs_release:
         cm4000_release(link);
         return -ENODEV;
@@ -1973,14 +1953,14 @@ static int __init cmm_init(void)
         printk(KERN_INFO "%s\n", version);
 
         cmm_class = class_create(THIS_MODULE, "cardman_4000");
-        if (!cmm_class)
-                return -1;
+        if (IS_ERR(cmm_class))
+                return PTR_ERR(cmm_class);
 
         major = register_chrdev(0, DEVICE_NAME, &cm4000_fops);
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
                         ": could not get major number\n");
-                return -1;
+                return major;
         }
 
         rc = pcmcia_register_driver(&cm4000_driver);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 55cf4be42976..9b1ff7e8f896 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -523,29 +523,11 @@ static int reader_config(struct pcmcia_device *link, int devno)
         int fail_fn, fail_rc;
         int rc;
 
-        tuple.DesiredTuple = CISTPL_CONFIG;
         tuple.Attributes = 0;
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
 
-        if ((fail_rc = pcmcia_get_first_tuple(link, &tuple)) != CS_SUCCESS) {
-                fail_fn = GetFirstTuple;
-                goto cs_failed;
-        }
-        if ((fail_rc = pcmcia_get_tuple_data(link, &tuple)) != CS_SUCCESS) {
-                fail_fn = GetTupleData;
-                goto cs_failed;
-        }
-        if ((fail_rc = pcmcia_parse_tuple(link, &tuple, &parse))
-                                                        != CS_SUCCESS) {
-                fail_fn = ParseTuple;
-                goto cs_failed;
-        }
-
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
-
         link->io.BasePort2 = 0;
         link->io.NumPorts2 = 0;
         link->io.Attributes2 = 0;
@@ -609,8 +591,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
 
         return 0;
 
-cs_failed:
-        cs_error(link, fail_fn, fail_rc);
 cs_release:
         reader_release(link);
         return -ENODEV;
@@ -721,14 +701,14 @@ static int __init cm4040_init(void)
 
         printk(KERN_INFO "%s\n", version);
         cmx_class = class_create(THIS_MODULE, "cardman_4040");
-        if (!cmx_class)
-                return -1;
+        if (IS_ERR(cmx_class))
+                return PTR_ERR(cmx_class);
 
         major = register_chrdev(0, DEVICE_NAME, &reader_fops);
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
                         ": could not get major number\n");
-                return -1;
+                return major;
         }
 
         rc = pcmcia_register_driver(&reader_driver);
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 1a0bc30b79d1..1bd12296dca5 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -421,7 +421,7 @@ static irqreturn_t mgslpc_isr(int irq, void *dev_id);
 /*
  * Bottom half interrupt handlers
  */
-static void bh_handler(void* Context);
+static void bh_handler(struct work_struct *work);
 static void bh_transmit(MGSLPC_INFO *info);
 static void bh_status(MGSLPC_INFO *info);
 
@@ -547,7 +547,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
 
     memset(info, 0, sizeof(MGSLPC_INFO));
     info->magic = MGSLPC_MAGIC;
-    INIT_WORK(&info->task, bh_handler, info);
+    INIT_WORK(&info->task, bh_handler);
     info->max_frame_size = 4096;
     info->close_delay = 5*HZ/10;
     info->closing_wait = 30*HZ;
@@ -604,17 +604,10 @@ static int mgslpc_config(struct pcmcia_device *link)
     if (debug_level >= DEBUG_LEVEL_INFO)
             printk("mgslpc_config(0x%p)\n", link);
 
-    /* read CONFIG tuple to find its configuration registers */
-    tuple.DesiredTuple = CISTPL_CONFIG;
     tuple.Attributes = 0;
     tuple.TupleData = buf;
     tuple.TupleDataMax = sizeof(buf);
     tuple.TupleOffset = 0;
-    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));
-    link->conf.ConfigBase = parse.config.base;
-    link->conf.Present = parse.config.rmask[0];
 
     /* get CIS configuration entry */
 
@@ -842,9 +835,9 @@ static int bh_action(MGSLPC_INFO *info)
         return rc;
 }
 
-static void bh_handler(void* Context)
+static void bh_handler(struct work_struct *work)
 {
-        MGSLPC_INFO *info = (MGSLPC_INFO*)Context;
+        MGSLPC_INFO *info = container_of(work, MGSLPC_INFO, task);
         int action;
 
         if (!info)