aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 23de22631c64..4726722a0635 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -592,7 +592,7 @@ static inline void e100_write_flush(struct nic *nic)
592 (void)readb(&nic->csr->scb.status); 592 (void)readb(&nic->csr->scb.status);
593} 593}
594 594
595static inline void e100_enable_irq(struct nic *nic) 595static void e100_enable_irq(struct nic *nic)
596{ 596{
597 unsigned long flags; 597 unsigned long flags;
598 598
@@ -602,7 +602,7 @@ static inline void e100_enable_irq(struct nic *nic)
602 e100_write_flush(nic); 602 e100_write_flush(nic);
603} 603}
604 604
605static inline void e100_disable_irq(struct nic *nic) 605static void e100_disable_irq(struct nic *nic)
606{ 606{
607 unsigned long flags; 607 unsigned long flags;
608 608
@@ -791,7 +791,7 @@ static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
791 791
792#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */ 792#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
793#define E100_WAIT_SCB_FAST 20 /* delay like the old code */ 793#define E100_WAIT_SCB_FAST 20 /* delay like the old code */
794static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr) 794static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
795{ 795{
796 unsigned long flags; 796 unsigned long flags;
797 unsigned int i; 797 unsigned int i;
@@ -822,7 +822,7 @@ err_unlock:
822 return err; 822 return err;
823} 823}
824 824
825static inline int e100_exec_cb(struct nic *nic, struct sk_buff *skb, 825static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
826 void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *)) 826 void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
827{ 827{
828 struct cb *cb; 828 struct cb *cb;
@@ -1567,7 +1567,7 @@ static void e100_watchdog(unsigned long data)
1567 mod_timer(&nic->watchdog, jiffies + E100_WATCHDOG_PERIOD); 1567 mod_timer(&nic->watchdog, jiffies + E100_WATCHDOG_PERIOD);
1568} 1568}
1569 1569
1570static inline void e100_xmit_prepare(struct nic *nic, struct cb *cb, 1570static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
1571 struct sk_buff *skb) 1571 struct sk_buff *skb)
1572{ 1572{
1573 cb->command = nic->tx_command; 1573 cb->command = nic->tx_command;
@@ -1617,7 +1617,7 @@ static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
1617 return 0; 1617 return 0;
1618} 1618}
1619 1619
1620static inline int e100_tx_clean(struct nic *nic) 1620static int e100_tx_clean(struct nic *nic)
1621{ 1621{
1622 struct cb *cb; 1622 struct cb *cb;
1623 int tx_cleaned = 0; 1623 int tx_cleaned = 0;
@@ -1728,7 +1728,7 @@ static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
1728} 1728}
1729 1729
1730#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN) 1730#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
1731static inline int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) 1731static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
1732{ 1732{
1733 if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN))) 1733 if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN)))
1734 return -ENOMEM; 1734 return -ENOMEM;
@@ -1762,7 +1762,7 @@ static inline int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
1762 return 0; 1762 return 0;
1763} 1763}
1764 1764
1765static inline int e100_rx_indicate(struct nic *nic, struct rx *rx, 1765static int e100_rx_indicate(struct nic *nic, struct rx *rx,
1766 unsigned int *work_done, unsigned int work_to_do) 1766 unsigned int *work_done, unsigned int work_to_do)
1767{ 1767{
1768 struct sk_buff *skb = rx->skb; 1768 struct sk_buff *skb = rx->skb;
@@ -1822,7 +1822,7 @@ static inline int e100_rx_indicate(struct nic *nic, struct rx *rx,
1822 return 0; 1822 return 0;
1823} 1823}
1824 1824
1825static inline void e100_rx_clean(struct nic *nic, unsigned int *work_done, 1825static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
1826 unsigned int work_to_do) 1826 unsigned int work_to_do)
1827{ 1827{
1828 struct rx *rx; 1828 struct rx *rx;