aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorWang Shaoyan <wangshaoyan.pt@taobao.com>2011-07-07 23:01:43 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-08 12:06:31 -0400
commit135d23d66c53ade614c288d422f4c4b3205eb201 (patch)
treeb32372abb251da59971576493e5bc24467904060 /drivers/atm
parent498d8e236304a62a2774d7264bdff2c6e8102b5b (diff)
ATM: Delete no use FILL_RX_POOLS_IN_BH marco
The macro FILL_RX_POOLS_IN_BH is never been used, in order to avoid the compiler reports error because of the usage of function INIT_WORK, we just delete the marco. Cc: Chas Williams <chas@cmf.nrl.navy.mil> Cc: linux-atm-general@lists.sourceforge.net Signed-off-by: Wang Shaoyan <wangshaoyan.pt@taobao.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/ambassador.c11
-rw-r--r--drivers/atm/ambassador.h4
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index a5fcb1eb862f..bb3b016b6ce8 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -813,7 +813,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool,
813 return; 813 return;
814} 814}
815 815
816// top up all RX pools (can also be called as a bottom half) 816// top up all RX pools
817static void fill_rx_pools (amb_dev * dev) { 817static void fill_rx_pools (amb_dev * dev) {
818 unsigned char pool; 818 unsigned char pool;
819 819
@@ -872,11 +872,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) {
872 ++irq_work; 872 ++irq_work;
873 873
874 if (irq_work) { 874 if (irq_work) {
875#ifdef FILL_RX_POOLS_IN_BH
876 schedule_work (&dev->bh);
877#else
878 fill_rx_pools (dev); 875 fill_rx_pools (dev);
879#endif
880 876
881 PRINTD (DBG_IRQ, "work done: %u", irq_work); 877 PRINTD (DBG_IRQ, "work done: %u", irq_work);
882 } else { 878 } else {
@@ -2154,11 +2150,6 @@ static void setup_dev(amb_dev *dev, struct pci_dev *pci_dev)
2154 dev->tx_avail = ATM_OC3_PCR; 2150 dev->tx_avail = ATM_OC3_PCR;
2155 dev->rx_avail = ATM_OC3_PCR; 2151 dev->rx_avail = ATM_OC3_PCR;
2156 2152
2157#ifdef FILL_RX_POOLS_IN_BH
2158 // initialise bottom half
2159 INIT_WORK(&dev->bh, (void (*)(void *)) fill_rx_pools, dev);
2160#endif
2161
2162 // semaphore for txer/rxer modifications - we cannot use a 2153 // semaphore for txer/rxer modifications - we cannot use a
2163 // spinlock as the critical region needs to switch processes 2154 // spinlock as the critical region needs to switch processes
2164 mutex_init(&dev->vcc_sf); 2155 mutex_init(&dev->vcc_sf);
diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h
index bd1c46a7ef49..aa9710556bd6 100644
--- a/drivers/atm/ambassador.h
+++ b/drivers/atm/ambassador.h
@@ -630,10 +630,6 @@ struct amb_dev {
630 u32 iobase; 630 u32 iobase;
631 u32 * membase; 631 u32 * membase;
632 632
633#ifdef FILL_RX_POOLS_IN_BH
634 struct work_struct bh;
635#endif
636
637 amb_cq cq; 633 amb_cq cq;
638 amb_txq txq; 634 amb_txq txq;
639 amb_rxq rxq[NUM_RX_POOLS]; 635 amb_rxq rxq[NUM_RX_POOLS];