Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 135d23d6 authored by Wang Shaoyan's avatar Wang Shaoyan Committed by David S. Miller
Browse files

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: default avatarWang Shaoyan <wangshaoyan.pt@taobao.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 498d8e23

drivers/atm/ambassador.c

+1 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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 {
@@ -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);

drivers/atm/ambassador.h

+0 −4
Original line number Diff line number Diff line
@@ -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];