Commit 2cf83afe authored by Denys Vlasenko's avatar Denys Vlasenko Committed by David S. Miller
Browse files

[ATM] drivers/atm/horizon.c: stop inlining largish static functions 



drivers/atm/horizon.c has unusually large number
of static inline functions - 36.

I looked through them. Most of them seems to be small enough,
but a few are big, others are using udelay or busy loop,
and as such are better not be inlined.

This patch removes "inline" from these static functions
(regardless of number of callsites - gcc nowadays auto-inlines
statics with one callsite).

Size difference for 32bit x86:
   text    data     bss     dec     hex filename
   8201     180       6    8387    20c3 linux-2.6-ALLYES/drivers/atm/horizon.o
   7840     180       6    8026    1f5a linux-2.6.inline-ALLYES/drivers/atm/horizon.o

Signed-off-by: default avatarDenys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac6f7819

drivers/atm/horizon.c

+12 −12
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static inline void FLUSH_RX_CHANNEL (hrz_dev * dev, u16 channel) { 
  return;

}



static inline void WAIT_FLUSH_RX_COMPLETE (hrz_dev * dev) {

static void WAIT_FLUSH_RX_COMPLETE (hrz_dev * dev) {

  while (rd_regw (dev, RX_CHANNEL_PORT_OFF) & FLUSH_CHANNEL)

    ;

  return;
@@ -435,7 +435,7 @@ static inline void SELECT_RX_CHANNEL (hrz_dev * dev, u16 channel) { 
  return;

}



static inline void WAIT_UPDATE_COMPLETE (hrz_dev * dev) {

static void WAIT_UPDATE_COMPLETE (hrz_dev * dev) {

  while (rd_regw (dev, RX_CHANNEL_PORT_OFF) & RX_CHANNEL_UPDATE_IN_PROGRESS)

    ;

  return;
@@ -796,7 +796,7 @@ static void hrz_change_vc_qos (ATM_RXER * rxer, MAAL_QOS * qos) { 


/********** free an skb (as per ATM device driver documentation) **********/



static inline void hrz_kfree_skb (struct sk_buff * skb) {

static void hrz_kfree_skb (struct sk_buff * skb) {

  if (ATM_SKB(skb)->vcc->pop) {

    ATM_SKB(skb)->vcc->pop (ATM_SKB(skb)->vcc, skb);

  } else {
@@ -1076,7 +1076,7 @@ static void rx_schedule (hrz_dev * dev, int irq) { 


/********** handle RX bus master complete events **********/



static inline void rx_bus_master_complete_handler (hrz_dev * dev) {

static void rx_bus_master_complete_handler (hrz_dev * dev) {

  if (test_bit (rx_busy, &dev->flags)) {

    rx_schedule (dev, 1);

  } else {
@@ -1089,7 +1089,7 @@ static inline void rx_bus_master_complete_handler (hrz_dev * dev) { 


/********** (queue to) become the next TX thread **********/



static inline int tx_hold (hrz_dev * dev) {

static int tx_hold (hrz_dev * dev) {

  PRINTD (DBG_TX, "sleeping at tx lock %p %lu", dev, dev->flags);

  wait_event_interruptible(dev->tx_queue, (!test_and_set_bit(tx_busy, &dev->flags)));

  PRINTD (DBG_TX, "woken at tx lock %p %lu", dev, dev->flags);
@@ -1232,7 +1232,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) { 


/********** handle TX bus master complete events **********/



static inline void tx_bus_master_complete_handler (hrz_dev * dev) {

static void tx_bus_master_complete_handler (hrz_dev * dev) {

  if (test_bit (tx_busy, &dev->flags)) {

    tx_schedule (dev, 1);

  } else {
@@ -1246,7 +1246,7 @@ static inline void tx_bus_master_complete_handler (hrz_dev * dev) { 
/********** move RX Q pointer to next item in circular buffer **********/



// called only from IRQ sub-handler

static inline u32 rx_queue_entry_next (hrz_dev * dev) {

static u32 rx_queue_entry_next (hrz_dev * dev) {

  u32 rx_queue_entry;

  spin_lock (&dev->mem_lock);

  rx_queue_entry = rd_mem (dev, &dev->rx_q_entry->entry);
@@ -1270,7 +1270,7 @@ static inline void rx_disabled_handler (hrz_dev * dev) { 
/********** handle RX data received by device **********/



// called from IRQ handler

static inline void rx_data_av_handler (hrz_dev * dev) {

static void rx_data_av_handler (hrz_dev * dev) {

  u32 rx_queue_entry;

  u32 rx_queue_entry_flags;

  u16 rx_len;
@@ -1394,7 +1394,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) 
  irq_ok = 0;

  while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)

	  & INTERESTING_INTERRUPTS)) {

    // In the interests of fairness, the (inline) handlers below are

    // In the interests of fairness, the handlers below are

    // called in sequence and without immediate return to the head of

    // the while loop. This is only of issue for slow hosts (or when

    // debugging messages are on). Really slow hosts may find a fast
@@ -1458,7 +1458,7 @@ static void do_housekeeping (unsigned long arg) { 
/********** find an idle channel for TX and set it up **********/



// called with tx_busy set

static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {

static short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {

  unsigned short idle_channels;

  short tx_channel = -1;

  unsigned int spin_count;
@@ -1777,13 +1777,13 @@ static void hrz_reset (const hrz_dev * dev) { 


/********** read the burnt in address **********/



static inline void WRITE_IT_WAIT (const hrz_dev *dev, u32 ctrl)

static void WRITE_IT_WAIT (const hrz_dev *dev, u32 ctrl)

{

	wr_regl (dev, CONTROL_0_REG, ctrl);

	udelay (5);

}

  

static inline void CLOCK_IT (const hrz_dev *dev, u32 ctrl)

static void CLOCK_IT (const hrz_dev *dev, u32 ctrl)

{

	// DI must be valid around rising SK edge

	WRITE_IT_WAIT(dev, ctrl & ~SEEPROM_SK);

CRA Git | Maintained and supported by SUSTech CRA and CCSE