Skip to content

Commit

Permalink
net: sh_eth: remove unnecessary function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yoshihiro Shimoda authored and David S. Miller committed Jun 27, 2012
1 parent ebe6e21 commit c265026
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
22 changes: 0 additions & 22 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1339,14 +1339,6 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
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 */
static void sh_eth_adjust_link(struct net_device *ndev)
{
Expand Down Expand Up @@ -1594,11 +1586,6 @@ static int sh_eth_open(struct net_device *ndev)
if (ret)
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;

out_free_irq:
Expand All @@ -1623,9 +1610,6 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
/* tx_errors count up */
ndev->stats.tx_errors++;

/* timer off */
del_timer_sync(&mdp->timer);

/* Free all the skbuffs in the Rx queue. */
for (i = 0; i < RX_RING_SIZE; i++) {
rxdesc = &mdp->rx_ring[i];
Expand All @@ -1643,10 +1627,6 @@ static void sh_eth_tx_timeout(struct net_device *ndev)

/* device init */
sh_eth_dev_init(ndev);

/* timer on */
mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */
add_timer(&mdp->timer);
}

/* Packet transmit function */
Expand Down Expand Up @@ -1719,8 +1699,6 @@ static int sh_eth_close(struct net_device *ndev)

free_irq(ndev->irq, ndev);

del_timer_sync(&mdp->timer);

/* Free all the skbuffs in the Rx queue. */
sh_eth_ring_free(ndev);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/renesas/sh_eth.h
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,6 @@ struct sh_eth_private {
struct sh_eth_txdesc *tx_ring;
struct sk_buff **rx_skbuff;
struct sk_buff **tx_skbuff;
struct timer_list timer;
spinlock_t lock;
u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
u32 cur_tx, dirty_tx;
Expand Down

0 comments on commit c265026

Please sign in to comment.