OSDN Git Service

staging: dgnc: Remove driver-wide polling counter variable
authorKonrad Zapalowicz <bergo.torino@gmail.com>
Sat, 16 Aug 2014 14:58:06 +0000 (16:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Aug 2014 16:52:24 +0000 (09:52 -0700)
The polling counter variable is only exposed via sysfs and has no other
purpose.

Now, since the polling shall be implemented as a board specific feature
rather than being global in the driver this counter is obsolete.

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgnc/dgnc_driver.c
drivers/staging/dgnc/dgnc_driver.h
drivers/staging/dgnc/dgnc_sysfs.c

index d3fc3c2..223075a 100644 (file)
@@ -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);
-ulong                  dgnc_poll_counter;
 uint                   dgnc_Major;
 int                    dgnc_poll_tick = 20;    /* Poll interval - 20 ms */
 
@@ -736,8 +735,6 @@ static void dgnc_poll_handler(ulong dummy)
        int i;
        unsigned long new_time;
 
-       dgnc_poll_counter++;
-
        /* Go thru each board, kicking off a tasklet for each if needed */
        for (i = 0; i < dgnc_NumBoards; i++) {
                brd = dgnc_Board[i];
index ac0fe36..d16d761 100644 (file)
@@ -492,7 +492,6 @@ extern int          dgnc_trcbuf_size;       /* Size of the ringbuffer       */
 extern spinlock_t      dgnc_global_lock;       /* Driver global spinlock       */
 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          */
 
 #endif
index 4765ba5..60d247b 100644 (file)
@@ -63,14 +63,6 @@ static ssize_t dgnc_driver_maxboards_show(struct device_driver *ddp, char *buf)
 }
 static DRIVER_ATTR(maxboards, S_IRUSR, dgnc_driver_maxboards_show, NULL);
 
-
-static ssize_t dgnc_driver_pollcounter_show(struct device_driver *ddp, char *buf)
-{
-       return snprintf(buf, PAGE_SIZE, "%ld\n", dgnc_poll_counter);
-}
-static DRIVER_ATTR(pollcounter, S_IRUSR, dgnc_driver_pollcounter_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);
@@ -121,7 +113,6 @@ void dgnc_create_driver_sysfiles(struct pci_driver *dgnc_driver)
        rc |= driver_create_file(driverfs, &driver_attr_debug);
        rc |= driver_create_file(driverfs, &driver_attr_rawreadok);
        rc |= driver_create_file(driverfs, &driver_attr_pollrate);
-       rc |= driver_create_file(driverfs, &driver_attr_pollcounter);
        if (rc) {
                printk(KERN_ERR "DGNC: sysfs driver_create_file failed!\n");
        }
@@ -137,7 +128,6 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
        driver_remove_file(driverfs, &driver_attr_debug);
        driver_remove_file(driverfs, &driver_attr_rawreadok);
        driver_remove_file(driverfs, &driver_attr_pollrate);
-       driver_remove_file(driverfs, &driver_attr_pollcounter);
 }