UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: sh_eth: remove unnecessary function 

The sh_eth_timer() called mod_timer() for itself. So, this patch
removes the function.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yoshihiro Shimoda 2012-06-26 19:59:51 +00:00 committed by David S. Miller
parent ebe6e21d23
commit c26502680e
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -1339,14 +1339,6 @@ other_irq:
return ret; return ret;
} }
static void sh_eth_timer(unsigned long data)
{
struct net_device *ndev = (struct net_device *)data;
struct sh_eth_private *mdp = netdev_priv(ndev);
mod_timer(&mdp->timer, jiffies + (10 * HZ));
}
/* PHY state control function */ /* PHY state control function */
static void sh_eth_adjust_link(struct net_device *ndev) static void sh_eth_adjust_link(struct net_device *ndev)
{ {
@ -1594,11 +1586,6 @@ static int sh_eth_open(struct net_device *ndev)
if (ret) if (ret)
goto out_free_irq; goto out_free_irq;
/* Set the timer to check for link beat. */
init_timer(&mdp->timer);
mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */
setup_timer(&mdp->timer, sh_eth_timer, (unsigned long)ndev);
return ret; return ret;
out_free_irq: out_free_irq:
@ -1623,9 +1610,6 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
/* tx_errors count up */ /* tx_errors count up */
ndev->stats.tx_errors++; ndev->stats.tx_errors++;
/* timer off */
del_timer_sync(&mdp->timer);
/* Free all the skbuffs in the Rx queue. */ /* Free all the skbuffs in the Rx queue. */
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
rxdesc = &mdp->rx_ring[i]; rxdesc = &mdp->rx_ring[i];
@ -1643,10 +1627,6 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
/* device init */ /* device init */
sh_eth_dev_init(ndev); sh_eth_dev_init(ndev);
/* timer on */
mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */
add_timer(&mdp->timer);
} }
/* Packet transmit function */ /* Packet transmit function */
@ -1719,8 +1699,6 @@ static int sh_eth_close(struct net_device *ndev)
free_irq(ndev->irq, ndev); free_irq(ndev->irq, ndev);
del_timer_sync(&mdp->timer);
/* Free all the skbuffs in the Rx queue. */ /* Free all the skbuffs in the Rx queue. */
sh_eth_ring_free(ndev); sh_eth_ring_free(ndev);

1
drivers/net/ethernet/renesas/sh_eth.h
View File

@ -772,7 +772,6 @@ struct sh_eth_private {
struct sh_eth_txdesc *tx_ring; struct sh_eth_txdesc *tx_ring;
struct sk_buff **rx_skbuff; struct sk_buff **rx_skbuff;
struct sk_buff **tx_skbuff; struct sk_buff **tx_skbuff;
struct timer_list timer;
spinlock_t lock; spinlock_t lock;
u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */ u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
u32 cur_tx, dirty_tx; u32 cur_tx, dirty_tx;