Skip to content

Commit

Permalink
ATM: Delete no use FILL_RX_POOLS_IN_BH marco
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wang Shaoyan authored and davem330 committed Jul 8, 2011
1 parent 498d8e2 commit 135d23d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
11 changes: 1 addition & 10 deletions drivers/atm/ambassador.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool,
return;
}

// top up all RX pools (can also be called as a bottom half)
// top up all RX pools
static void fill_rx_pools (amb_dev * dev) {
unsigned char pool;

Expand Down Expand Up @@ -872,11 +872,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) {
++irq_work;

if (irq_work) {
#ifdef FILL_RX_POOLS_IN_BH
schedule_work (&dev->bh);
#else
fill_rx_pools (dev);
#endif

PRINTD (DBG_IRQ, "work done: %u", irq_work);
} else {
Expand Down Expand Up @@ -2154,11 +2150,6 @@ static void setup_dev(amb_dev *dev, struct pci_dev *pci_dev)
dev->tx_avail = ATM_OC3_PCR;
dev->rx_avail = ATM_OC3_PCR;

#ifdef FILL_RX_POOLS_IN_BH
// initialise bottom half
INIT_WORK(&dev->bh, (void (*)(void *)) fill_rx_pools, dev);
#endif

// semaphore for txer/rxer modifications - we cannot use a
// spinlock as the critical region needs to switch processes
mutex_init(&dev->vcc_sf);
Expand Down
4 changes: 0 additions & 4 deletions drivers/atm/ambassador.h
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,6 @@ struct amb_dev {
u32 iobase;
u32 * membase;

#ifdef FILL_RX_POOLS_IN_BH
struct work_struct bh;
#endif

amb_cq cq;
amb_txq txq;
amb_rxq rxq[NUM_RX_POOLS];
Expand Down

0 comments on commit 135d23d

Please sign in to comment.