staging: dgnc: remove blankline before brace

[mirror_ubuntu-zesty-kernel.git] / drivers / staging / dgnc / dgnc_driver.c

diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index 7546aff6500243cda1e9806c4070ec9827c528a6..4bb3e6fb7fa65911abb7004c5006e64864f3c216 100644 (file)
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -13,7 +13,6 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -39,7 +38,6 @@ MODULE_SUPPORTED_DEVICE("dgnc");
  */
 static int             dgnc_start(void);
 static int             dgnc_finalize_board_init(struct dgnc_board *brd);
-static void            dgnc_init_globals(void);
 static int             dgnc_found_board(struct pci_dev *pdev, int id);
 static void            dgnc_cleanup_board(struct dgnc_board *brd);
 static void            dgnc_poll_handler(ulong dummy);
@@ -57,13 +55,13 @@ static const struct file_operations dgnc_BoardFops = {
        .release        =       dgnc_mgmt_close
 };
 
-
 /*
  * Globals
  */
 uint                   dgnc_NumBoards;
 struct dgnc_board              *dgnc_Board[MAXBOARDS];
 DEFINE_SPINLOCK(dgnc_global_lock);
+DEFINE_SPINLOCK(dgnc_poll_lock); /* Poll scheduling lock */
 uint                   dgnc_Major;
 int                    dgnc_poll_tick = 20;    /* Poll interval - 20 ms */
 
@@ -75,12 +73,10 @@ static struct class *dgnc_class;
 /*
  * Poller stuff
  */
-static DEFINE_SPINLOCK(dgnc_poll_lock); /* Poll scheduling lock */
 static ulong           dgnc_poll_time; /* Time of next poll */
 static uint            dgnc_poll_stop; /* Used to tell poller to stop */
 static struct timer_list dgnc_poll_timer;
 
-
 static const struct pci_device_id dgnc_pci_tbl[] = {
        {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID),     .driver_data = 0},
        {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
@@ -216,8 +212,8 @@ static int dgnc_start(void)
        unsigned long flags;
        struct device *dev;
 
-       /* make sure that the globals are init'd before we do anything else */
-       dgnc_init_globals();
+       /* make sure timer is initialized before we do anything else */
+       init_timer(&dgnc_poll_timer);
 
        /*
         * Register our base character device into the kernel.
@@ -355,13 +351,11 @@ static void dgnc_cleanup_board(struct dgnc_board *brd)
                }
        }
 
-
        dgnc_Board[brd->boardnum] = NULL;
 
        kfree(brd);
 }
 
-
 /*
  * dgnc_found_board()
  *
@@ -422,7 +416,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
        pci_irq = pdev->irq;
        brd->irq = pci_irq;
 
-
        switch (brd->device) {
 
        case PCI_DEVICE_CLASSIC_4_DID:
@@ -442,7 +435,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
                 * 4    Memory Mapped UARTs and Status
                 */
 
-
                /* get the PCI Base Address Registers */
                brd->membase = pci_resource_start(pdev, 4);
 
@@ -483,7 +475,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
 
                break;
 
-
        case PCI_DEVICE_NEO_4_DID:
        case PCI_DEVICE_NEO_8_DID:
        case PCI_DEVICE_NEO_2DB9_DID:
@@ -538,7 +529,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
                dev_err(&brd->pdev->dev,
                        "Didn't find any compatible Neo/Classic PCI boards.\n");
                return -ENXIO;
-
        }
 
        /*
@@ -590,10 +580,8 @@ failed:
        brd->dpastatus = BD_NOFEP;
 
        return -ENXIO;
-
 }
 
-
 static int dgnc_finalize_board_init(struct dgnc_board *brd)
 {
        int rc = 0;
@@ -628,7 +616,6 @@ static void dgnc_do_remap(struct dgnc_board *brd)
        brd->re_map_membase = ioremap(brd->membase, 0x1000);
 }
 
-
 /*****************************************************************************
 *
 * Function:
@@ -698,23 +685,3 @@ static void dgnc_poll_handler(ulong dummy)
        if (!dgnc_poll_stop)
                add_timer(&dgnc_poll_timer);
 }
-
-/*
- * dgnc_init_globals()
- *
- * This is where we initialize the globals from the static insmod
- * configuration variables.  These are declared near the head of
- * this file.
- */
-static void dgnc_init_globals(void)
-{
-       int i = 0;
-
-       dgnc_NumBoards          = 0;
-
-       for (i = 0; i < MAXBOARDS; i++)
-               dgnc_Board[i] = NULL;
-
-       init_timer(&dgnc_poll_timer);
-}
-