Staging: comedi: Misc code cleanups for checkpatch

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 8a3a1786c15269e580497c8cf9a195fef5ba350b..d4750e503aad88f6f826d5fe6c982e98c8e828cd 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -53,9 +53,9 @@
 
 #define COMEDI_INITCLEANUP_NOMODULE(x)                                 \
        static int __init x ## _init_module(void)                       \
-               {return comedi_driver_register(&(x));}                  \
+               {return comedi_driver_register(&(x)); }                 \
        static void __exit x ## _cleanup_module(void)                   \
-               {comedi_driver_unregister(&(x));}                       \
+               {comedi_driver_unregister(&(x)); }                      \
        module_init(x ## _init_module);                                 \
        module_exit(x ## _cleanup_module);                                      \
 

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index d474cb2cb7e525b8c303d5a57091adff4a894302..9603d9e24d30320729ef190524e295d5ba8182be 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -179,7 +179,7 @@ static comedi_driver driver_icp_multi = {
       attach : icp_multi_attach,
       detach : icp_multi_detach,
       num_names : n_boardtypes,
-      board_name:&boardtypes[0].name,
+      board_name : &boardtypes[0].name,
       offset : sizeof(boardtype),
 };
 
@@ -947,7 +947,7 @@ static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it)
                n_subdevices++;
 
        ret = alloc_subdevices(dev, n_subdevices);
-       if ( ret < 0 )
+       if (ret < 0)
                return ret;
 
        icp_multi_reset(dev);

diff --git a/drivers/staging/comedi/drivers/icp_multi.h b/drivers/staging/comedi/drivers/icp_multi.h
index 0796056a07a4164cbf63d15a237a7487fcd6aacd..21d84766fea876eb44c24f58d01b02dbf6d3249e 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.h
+++ b/drivers/staging/comedi/drivers/icp_multi.h
@@ -246,7 +246,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
 
        if ((pci_bus < 1) & (pci_slot < 1)) {   /* use autodetection */
 
-               card = find_free_pci_card_by_device(vendor_id,device_id);
+               card = find_free_pci_card_by_device(vendor_id, device_id);
                if (card == NULL) {
                        rt_printk(" - Unused card not found in system!\n");
                        return NULL;
@@ -268,7 +268,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
        }
 
        err = pci_card_alloc(card);
-       if ( err != 0) {
+       if (err != 0) {
                if (err > 0)
                        rt_printk(" - Can't allocate card!\n");
                /* else: error already printed. */

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index c82aeff8ff58642b1cf5d4a945c7aeb5e63c6649..c7fe073f27b7f96a47369c1930050c1e529f9dca 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -63,7 +63,7 @@
 
 MODULE_LICENSE("GPL");
 
-struct mite_struct *mite_devices = NULL;
+struct mite_struct *mite_devices;
 
 #define TOP_OF_PAGE(x) ((x)|(~(PAGE_MASK)))
 

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 578b731ae5003da40f1f5807808c8c00cd084275..95e4af27bd8d7fa2e64f770b1a6e876476481f80 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -2155,7 +2155,7 @@ static int rtd_ao_winsn(comedi_device *dev,
                /* VERIFY: comedi range and offset conversions */
 
                if ((range > 1) /* bipolar */
-                       &&(data[i] < 2048)) {
+                       && (data[i] < 2048)) {
                        /* offset and sign extend */
                        val = (((int)data[i]) - 2048) << 3;
                } else {        /* unipolor */

diff --git a/drivers/staging/comedi/rt.c b/drivers/staging/comedi/rt.c
index ba9c70ecd044b34a2fcbbbe38c1b9df764e59d05..f4b851252541d6fc379cfd489e952e2b43e588c9 100644 (file)
--- a/drivers/staging/comedi/rt.c
+++ b/drivers/staging/comedi/rt.c
@@ -180,7 +180,7 @@ void comedi_rt_pend_wakeup(wait_queue_head_t *q)
 
 #ifndef HAVE_RT_REQUEST_IRQ_WITH_ARG
 #define DECLARE_VOID_IRQ(irq) \
-static void handle_void_irq_ ## irq (void){ handle_void_irq(irq);}
+static void handle_void_irq_ ## irq (void){ handle_void_irq(irq); }
 
 static void handle_void_irq(int irq)
 {