[PATCH] pcmcia: add return value to _config() functions

Most of the driver initialization isn't done in the .probe function, but in
the internal _config() functions. Make them return a value, so that .probe
can properly report whether the probing of the device succeeded or not.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

5 files changed, 45 insertions, 47 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index c9c794e2926d..28f9211726c5 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -51,7 +51,7 @@ MODULE_LICENSE("GPL");
    handler.
 */
 
-static void avmcs_config(struct pcmcia_device *link);
+static int avmcs_config(struct pcmcia_device *link);
 static void avmcs_release(struct pcmcia_device *link);
 
 /*
@@ -99,7 +99,7 @@ typedef struct local_info_t {
     
 ======================================================================*/
 
-static int avmcs_attach(struct pcmcia_device *p_dev)
+static int avmcs_probe(struct pcmcia_device *p_dev)
 {
     local_info_t *local;
 
@@ -128,12 +128,10 @@ static int avmcs_attach(struct pcmcia_device *p_dev)
     p_dev->priv = local;
 
     p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    avmcs_config(p_dev);
-
-    return 0;
+    return avmcs_config(p_dev);
 
  err:
-    return -EINVAL;
+    return -ENOMEM;
 } /* avmcs_attach */
 
 /*======================================================================
@@ -185,7 +183,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
     return get_tuple(handle, tuple, parse);
 }
 
-static void avmcs_config(struct pcmcia_device *link)
+static int avmcs_config(struct pcmcia_device *link)
 {
     tuple_t tuple;
     cisparse_t parse;
@@ -219,7 +217,7 @@ static void avmcs_config(struct pcmcia_device *link)
     if (i != CS_SUCCESS) {
         cs_error(link, ParseTuple, i);
         link->state &= ~DEV_CONFIG_PENDING;
-        return;
+        return -ENODEV;
     }
     
     /* Configure card */
@@ -319,7 +317,7 @@ found_port:
     /* If any step failed, release any partially configured state */
     if (i != 0) {
         avmcs_release(link);
-        return;
+        return -ENODEV;
     }
 
 
@@ -333,9 +331,10 @@ found_port:
         printk(KERN_ERR "avm_cs: failed to add AVM-%s-Controller at i/o %#x, irq %d\n",
                 dev->node.dev_name, link->io.BasePort1, link->irq.AssignedIRQ);
         avmcs_release(link);
-        return;
+        return -ENODEV;
     }
     dev->node.minor = i;
+    return 0;
 
 } /* avmcs_config */
 
@@ -367,7 +366,7 @@ static struct pcmcia_driver avmcs_driver = {
         .drv    = {
                 .name   = "avm_cs",
         },
-        .probe = avmcs_attach,
+        .probe = avmcs_probe,
         .remove = avmcs_detach,
         .id_table = avmcs_ids,
 };
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index ff6b0e185bc4..11c7c4f09e7e 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -67,7 +67,7 @@ module_param(isdnprot, int, 0);
    handler.
 */
 
-static void avma1cs_config(struct pcmcia_device *link);
+static int avma1cs_config(struct pcmcia_device *link);
 static void avma1cs_release(struct pcmcia_device *link);
 
 /*
@@ -116,7 +116,7 @@ typedef struct local_info_t {
     
 ======================================================================*/
 
-static int avma1cs_attach(struct pcmcia_device *p_dev)
+static int avma1cs_probe(struct pcmcia_device *p_dev)
 {
     local_info_t *local;
 
@@ -150,9 +150,7 @@ static int avma1cs_attach(struct pcmcia_device *p_dev)
     p_dev->conf.Present = PRESENT_OPTION;
 
     p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    avma1cs_config(p_dev);
-
-    return 0;
+    return avma1cs_config(p_dev);
 } /* avma1cs_attach */
 
 /*======================================================================
@@ -206,7 +204,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
     return get_tuple(handle, tuple, parse);
 }
 
-static void avma1cs_config(struct pcmcia_device *link)
+static int avma1cs_config(struct pcmcia_device *link)
 {
     tuple_t tuple;
     cisparse_t parse;
@@ -242,7 +240,7 @@ static void avma1cs_config(struct pcmcia_device *link)
     if (i != CS_SUCCESS) {
         cs_error(link, ParseTuple, i);
         link->state &= ~DEV_CONFIG_PENDING;
-        return;
+        return -ENODEV;
     }
     
     /* Configure card */
@@ -325,7 +323,7 @@ found_port:
     /* If any step failed, release any partially configured state */
     if (i != 0) {
         avma1cs_release(link);
-        return;
+        return -ENODEV;
     }
 
     printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
@@ -340,10 +338,11 @@ found_port:
     if (i < 0) {
         printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n", i, link->io.BasePort1);
         avma1cs_release(link);
-        return;
+        return -ENODEV;
     }
     dev->node.minor = i;
 
+    return 0;
 } /* avma1cs_config */
 
 /*======================================================================
@@ -379,7 +378,7 @@ static struct pcmcia_driver avma1cs_driver = {
         .drv            = {
                 .name   = "avma1_cs",
         },
-        .probe          = avma1cs_attach,
+        .probe          = avma1cs_probe,
         .remove         = avma1cs_detach,
         .id_table       = avma1cs_ids,
 };
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 7a42bd43162f..4856680ce761 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -94,7 +94,7 @@ module_param(protocol, int, 0);
    handler.
 */
 
-static void elsa_cs_config(struct pcmcia_device *link);
+static int elsa_cs_config(struct pcmcia_device *link);
 static void elsa_cs_release(struct pcmcia_device *link);
 
 /*
@@ -139,7 +139,7 @@ typedef struct local_info_t {
 
 ======================================================================*/
 
-static int elsa_cs_attach(struct pcmcia_device *link)
+static int elsa_cs_probe(struct pcmcia_device *link)
 {
     local_info_t *local;
 
@@ -175,9 +175,7 @@ static int elsa_cs_attach(struct pcmcia_device *link)
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    elsa_cs_config(link);
-
-    return 0;
+    return elsa_cs_config(link);
 } /* elsa_cs_attach */
 
 /*======================================================================
@@ -235,7 +233,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
     return get_tuple(handle, tuple, parse);
 }
 
-static void elsa_cs_config(struct pcmcia_device *link)
+static int elsa_cs_config(struct pcmcia_device *link)
 {
     tuple_t tuple;
     cisparse_t parse;
@@ -346,10 +344,11 @@ static void elsa_cs_config(struct pcmcia_device *link)
     } else
         ((local_info_t*)link->priv)->cardnr = i;
 
-    return;
+    return 0;
 cs_failed:
     cs_error(link, last_fn, i);
     elsa_cs_release(link);
+    return -ENODEV;
 } /* elsa_cs_config */
 
 /*======================================================================
@@ -406,7 +405,7 @@ static struct pcmcia_driver elsa_cs_driver = {
         .drv            = {
                 .name   = "elsa_cs",
         },
-        .probe          = elsa_cs_attach,
+        .probe          = elsa_cs_probe,
         .remove         = elsa_cs_detach,
         .id_table       = elsa_ids,
         .suspend        = elsa_suspend,
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 2af48a684654..a35a29586a62 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -95,7 +95,7 @@ module_param(protocol, int, 0);
    event handler. 
 */
 
-static void sedlbauer_config(struct pcmcia_device *link);
+static int sedlbauer_config(struct pcmcia_device *link);
 static void sedlbauer_release(struct pcmcia_device *link);
 
 /*
@@ -148,7 +148,7 @@ typedef struct local_info_t {
     
 ======================================================================*/
 
-static int sedlbauer_attach(struct pcmcia_device *link)
+static int sedlbauer_probe(struct pcmcia_device *link)
 {
     local_info_t *local;
 
@@ -187,9 +187,7 @@ static int sedlbauer_attach(struct pcmcia_device *link)
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    sedlbauer_config(link);
-
-    return 0;
+    return sedlbauer_config(link);
 } /* sedlbauer_attach */
 
 /*======================================================================
@@ -224,7 +222,7 @@ static void sedlbauer_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 void sedlbauer_config(struct pcmcia_device *link)
+static int sedlbauer_config(struct pcmcia_device *link)
 {
     local_info_t *dev = link->priv;
     tuple_t tuple;
@@ -423,14 +421,16 @@ static void sedlbauer_config(struct pcmcia_device *link)
         printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n",
                 last_ret, link->io.BasePort1);
         sedlbauer_release(link);
+        return -ENODEV;
     } else
         ((local_info_t*)link->priv)->cardnr = last_ret;
 
-    return;
+    return 0;
 
 cs_failed:
     cs_error(link, last_fn, last_ret);
     sedlbauer_release(link);
+    return -ENODEV;
 
 } /* sedlbauer_config */
 
@@ -493,7 +493,7 @@ static struct pcmcia_driver sedlbauer_driver = {
         .drv            = {
                 .name   = "sedlbauer_cs",
         },
-        .probe          = sedlbauer_attach,
+        .probe          = sedlbauer_probe,
         .remove         = sedlbauer_detach,
         .id_table       = sedlbauer_ids,
         .suspend        = sedlbauer_suspend,
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 698e9ec95f0b..7b66038096f3 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -75,7 +75,7 @@ module_param(protocol, int, 0);
    handler.
 */
 
-static void teles_cs_config(struct pcmcia_device *link);
+static int teles_cs_config(struct pcmcia_device *link);
 static void teles_cs_release(struct pcmcia_device *link);
 
 /*
@@ -130,7 +130,7 @@ typedef struct local_info_t {
 
 ======================================================================*/
 
-static int teles_attach(struct pcmcia_device *link)
+static int teles_probe(struct pcmcia_device *link)
 {
     local_info_t *local;
 
@@ -165,9 +165,7 @@ static int teles_attach(struct pcmcia_device *link)
     link->conf.IntType = INT_MEMORY_AND_IO;
 
     link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-    teles_cs_config(link);
-
-    return 0;
+    return teles_cs_config(link);
 } /* teles_attach */
 
 /*======================================================================
@@ -225,7 +223,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
     return get_tuple(handle, tuple, parse);
 }
 
-static void teles_cs_config(struct pcmcia_device *link)
+static int teles_cs_config(struct pcmcia_device *link)
 {
     tuple_t tuple;
     cisparse_t parse;
@@ -333,13 +331,16 @@ static void teles_cs_config(struct pcmcia_device *link)
         printk(KERN_ERR "teles_cs: failed to initialize Teles PCMCIA %d at i/o %#x\n",
                 i, link->io.BasePort1);
         teles_cs_release(link);
-    } else
-        ((local_info_t*)link->priv)->cardnr = i;
+        return -ENODEV;
+    }
+
+    ((local_info_t*)link->priv)->cardnr = i;
+    return 0;
 
-    return;
 cs_failed:
     cs_error(link, last_fn, i);
     teles_cs_release(link);
+    return -ENODEV;
 } /* teles_cs_config */
 
 /*======================================================================
@@ -396,7 +397,7 @@ static struct pcmcia_driver teles_cs_driver = {
         .drv            = {
                 .name   = "teles_cs",
         },
-        .probe          = teles_attach,
+        .probe          = teles_probe,
         .remove         = teles_detach,
         .id_table       = teles_ids,
         .suspend        = teles_suspend,