staging: dgnc: Remove driver-wide state variable

This commit removes the driver's global state variable. This is ok
because the state was changed only once at the end of init phase thus
the future usage of this variable is pointless.

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index 7bbe98080edf56fdbb42fdf044806275dfcf158e..d3fc3c2b5645656084dd364a5486312992e8fe55 100644 (file)
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -90,7 +90,6 @@ static const struct file_operations dgnc_BoardFops = {
 uint                   dgnc_NumBoards;
 struct dgnc_board              *dgnc_Board[MAXBOARDS];
 DEFINE_SPINLOCK(dgnc_global_lock);
-int                    dgnc_driver_state = DRIVER_INITIALIZED;
 ulong                  dgnc_poll_counter;
 uint                   dgnc_Major;
 int                    dgnc_poll_tick = 20;    /* Poll interval - 20 ms */
@@ -174,12 +173,6 @@ char *dgnc_state_text[] = {
        "Board READY",
 };
 
-char *dgnc_driver_state_text[] = {
-       "Driver Initialized",
-       "Driver Ready."
-};
-
-
 
 /************************************************************************
  *
@@ -331,8 +324,6 @@ static int dgnc_start(void)
 
        add_timer(&dgnc_poll_timer);
 
-       dgnc_driver_state = DRIVER_READY;
-
        return rc;
 }
 
@@ -747,14 +738,6 @@ static void dgnc_poll_handler(ulong dummy)
 
        dgnc_poll_counter++;
 
-       /*
-        * Do not start the board state machine until
-        * driver tells us its up and running, and has
-        * everything it needs.
-        */
-       if (dgnc_driver_state != DRIVER_READY)
-               goto schedule_poller;
-
        /* Go thru each board, kicking off a tasklet for each if needed */
        for (i = 0; i < dgnc_NumBoards; i++) {
                brd = dgnc_Board[i];
@@ -773,8 +756,6 @@ static void dgnc_poll_handler(ulong dummy)
                DGNC_UNLOCK(brd->bd_lock, lock_flags);
        }
 
-schedule_poller:
-
        /*
         * Schedule ourself back at the nominal wakeup interval.
         */

diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index eae04940062c1c06cd14b492162bc6f40caa76e7..ac0fe36400604a927d77bcdd2e99f8c50735d8a5 100644 (file)
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -484,7 +484,6 @@ struct channel_t {
 /*
  * Our Global Variables.
  */
-extern int             dgnc_driver_state;      /* The state of the driver      */
 extern uint            dgnc_Major;             /* Our driver/mgmt major        */
 extern int             dgnc_debug;             /* Debug variable               */
 extern int             dgnc_rawreadok;         /* Set if user wants rawreads   */
@@ -495,6 +494,5 @@ extern uint         dgnc_NumBoards;         /* Total number of boards       */
 extern struct dgnc_board       *dgnc_Board[MAXBOARDS]; /* Array of board structs       */
 extern ulong           dgnc_poll_counter;      /* Times the poller has run     */
 extern char            *dgnc_state_text[];     /* Array of state text          */
-extern char            *dgnc_driver_state_text[];/* Array of driver state text */
 
 #endif

diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
index 3f321bb2b79dc73b42e0aa50809749526b03f956..4765ba5484e51c01dd78a41580b4f029082678e0 100644 (file)
--- a/drivers/staging/dgnc/dgnc_sysfs.c
+++ b/drivers/staging/dgnc/dgnc_sysfs.c
@@ -71,13 +71,6 @@ static ssize_t dgnc_driver_pollcounter_show(struct device_driver *ddp, char *buf
 static DRIVER_ATTR(pollcounter, S_IRUSR, dgnc_driver_pollcounter_show, NULL);
 
 
-static ssize_t dgnc_driver_state_show(struct device_driver *ddp, char *buf)
-{
-       return snprintf(buf, PAGE_SIZE, "%s\n", dgnc_driver_state_text[dgnc_driver_state]);
-}
-static DRIVER_ATTR(state, S_IRUSR, dgnc_driver_state_show, NULL);
-
-
 static ssize_t dgnc_driver_debug_show(struct device_driver *ddp, char *buf)
 {
        return snprintf(buf, PAGE_SIZE, "0x%x\n", dgnc_debug);
@@ -129,7 +122,6 @@ void dgnc_create_driver_sysfiles(struct pci_driver *dgnc_driver)
        rc |= driver_create_file(driverfs, &driver_attr_rawreadok);
        rc |= driver_create_file(driverfs, &driver_attr_pollrate);
        rc |= driver_create_file(driverfs, &driver_attr_pollcounter);
-       rc |= driver_create_file(driverfs, &driver_attr_state);
        if (rc) {
                printk(KERN_ERR "DGNC: sysfs driver_create_file failed!\n");
        }
@@ -146,7 +138,6 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
        driver_remove_file(driverfs, &driver_attr_rawreadok);
        driver_remove_file(driverfs, &driver_attr_pollrate);
        driver_remove_file(driverfs, &driver_attr_pollcounter);
-       driver_remove_file(driverfs, &driver_attr_state);
 }