staging: comedi: ni_labpc_cs: cleanup labpc_cs_attach()

Absorb the code from labpc_config() into this function and properly
return the error if the configuration fails.

Also, remove the dev_dbg() function trace message.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 61ad5ce37a4eec3829d32d5ca1bd205df4b12458..e3ea13d845008be4d2e4bb4a3c40ec6e2ff82432 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -168,11 +168,18 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
        return pcmcia_request_io(p_dev);
 }
 
-static void labpc_config(struct pcmcia_device *link)
+static int labpc_cs_attach(struct pcmcia_device *link)
 {
+       struct local_info_t *local;
        int ret;
 
-       dev_dbg(&link->dev, "labpc_config\n");
+       local = kzalloc(sizeof(*local), GFP_KERNEL);
+       if (!local)
+               return -ENOMEM;
+       local->link = link;
+       link->priv = local;
+
+       pcmcia_cur_dev = link;
 
        link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ |
                CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;
@@ -190,30 +197,11 @@ static void labpc_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       return;
+       return 0;
 
 failed:
        pcmcia_disable_device(link);
-}
-
-static int labpc_cs_attach(struct pcmcia_device *link)
-{
-       struct local_info_t *local;
-
-       dev_dbg(&link->dev, "labpc_cs_attach()\n");
-
-       /* Allocate space for private device-specific data */
-       local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
-       if (!local)
-               return -ENOMEM;
-       local->link = link;
-       link->priv = local;
-
-       pcmcia_cur_dev = link;
-
-       labpc_config(link);
-
-       return 0;
+       return ret;
 }
 
 static void labpc_cs_detach(struct pcmcia_device *link)