Staging: fix assorted typos all over the place

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / ni_labpc_cs.c

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index b4c7dfa..0b963bb 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -59,8 +59,7 @@ NI manuals:
 
 */
 
-#undef LABPC_DEBUG
-                           /* #define LABPC_DEBUG *//*  enable debugging messages */
+#undef LABPC_DEBUG  /* debugging messages */
 
 #include "../comedidev.h"
 
@@ -77,14 +76,15 @@ NI manuals:
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
-static struct pcmcia_device *pcmcia_cur_dev = NULL;
+static struct pcmcia_device *pcmcia_cur_dev;
 
 static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it);
 
 static const struct labpc_board_struct labpc_cs_boards[] = {
        {
         .name = "daqcard-1200",
-        .device_id = 0x103,    /*  0x10b is manufacturer id, 0x103 is device id */
+        .device_id = 0x103,    /* 0x10b is manufacturer id,
+                                  0x103 is device id */
         .ai_speed = 10000,
         .bustype = pcmcia_bustype,
         .register_layout = labpc_1200_layout,
@@ -230,7 +230,6 @@ static int labpc_cs_attach(struct pcmcia_device *link)
 
        /* Interrupt setup */
        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE;
-       link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID;
        link->irq.Handler = NULL;
 
        /*
@@ -274,9 +273,8 @@ static void labpc_cs_detach(struct pcmcia_device *link)
                labpc_release(link);
        }
 
-       /* This points to the parent local_info_t struct */
-       if (link->priv)
-               kfree(link->priv);
+       /* This points to the parent local_info_t struct (may be null) */
+       kfree(link->priv);
 
 }                              /* labpc_cs_detach */
 
@@ -342,7 +340,7 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
                if (req->Size < 0x1000)
                        req->Size = 0x1000;
                req->AccessSpeed = 0;
-               if (pcmcia_request_window(&p_dev, req, &p_dev->win))
+               if (pcmcia_request_window(p_dev, req, &p_dev->win))
                        return -ENODEV;
                map.Page = 0;
                map.CardOffset = mem->win[0].card_addr;