staging: comedi: cb_das16_cs: refactor the pcmcia attach/detach

Move the pcmcia_disable_device() call where needed in the
pcmcia attach/detach and delete the das16cs_pcmcia_release()
function.

Move the logic of das16cs_pcmcia_config() directly into the
attach function and properly return an error code when the
config fails.

Only set the cur_dev, used by the comedi_driver, if the pcmcia
attach is successful. Also, make sure to NULL it in the detach.

Remove all the kernel messages in the pcmcia support code. They
are just added noise.

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

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index dc9c8231c4763e78f3d90eec2295a13b522cbd7d..5171cfe29b08ddb3cc1c1052513aece1efbad38a 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -629,12 +629,6 @@ struct local_info_t {
        struct bus_operations *bus;
 };
 
-static void das16cs_pcmcia_release(struct pcmcia_device *link)
-{
-       dev_dbg(&link->dev, "das16cs_pcmcia_release\n");
-       pcmcia_disable_device(link);
-}
-
 static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                void *priv_data)
 {
@@ -644,20 +638,24 @@ static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
        return pcmcia_request_io(p_dev);
 }
 
-static void das16cs_pcmcia_config(struct pcmcia_device *link)
+static int das16cs_pcmcia_attach(struct pcmcia_device *link)
 {
+       struct local_info_t *local;
        int ret;
 
-       dev_dbg(&link->dev, "das16cs_pcmcia_config\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;
 
        /* Do we need to allocate an interrupt? */
        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
 
        ret = pcmcia_loop_config(link, das16cs_pcmcia_config_loop, NULL);
-       if (ret) {
-               dev_warn(&link->dev, "no configuration found\n");
+       if (ret)
                goto failed;
-       }
 
        if (!link->irq)
                goto failed;
@@ -666,40 +664,21 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
        if (ret)
                goto failed;
 
-       return;
-
-failed:
-       das16cs_pcmcia_release(link);
-}
-
-static int das16cs_pcmcia_attach(struct pcmcia_device *link)
-{
-       struct local_info_t *local;
-
-       dev_dbg(&link->dev, "das16cs_pcmcia_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;
-
        cur_dev = link;
-
-       das16cs_pcmcia_config(link);
-
        return 0;
+
+failed:
+       pcmcia_disable_device(link);
+       return ret;
 }
 
 static void das16cs_pcmcia_detach(struct pcmcia_device *link)
 {
-       dev_dbg(&link->dev, "das16cs_pcmcia_detach\n");
-
        ((struct local_info_t *)link->priv)->stop = 1;
-       das16cs_pcmcia_release(link);
+       pcmcia_disable_device(link);
        /* This points to the parent struct local_info_t struct */
        kfree(link->priv);
+       cur_dev = NULL;
 }
 
 static int das16cs_pcmcia_suspend(struct pcmcia_device *link)