diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-25 03:53:42 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-27 12:09:16 +0900 |
| commit | e2009be038143b4a8c7d4b51b74da63220739a74 (patch) | |
| tree | 7bc7bba2f946a36db5f12bb212e1c97be23a561a /drivers/net/wan/dscc4.c | |
| parent | drivers/net: sxgbe: Convert timers to use timer_setup() (diff) | |
| download | linux-dev-e2009be038143b4a8c7d4b51b74da63220739a74.tar.xz linux-dev-e2009be038143b4a8c7d4b51b74da63220739a74.zip | |
drivers/net: wan/dscc4: Remove unused timer
This removes an entirely unused timer, which avoids needing to convert it
to timer_setup().
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 64f176496da4..c0b0f525c87c 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -223,8 +223,6 @@ struct dscc4_dev_priv { u32 scc_regs[SCC_REGISTERS_MAX]; /* Cf errata DS5 p.4 */ - struct timer_list timer; - struct dscc4_pci_priv *pci_priv; spinlock_t lock; @@ -369,7 +367,6 @@ static int dscc4_close(struct net_device *); static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int dscc4_init_ring(struct net_device *); static void dscc4_release_ring(struct dscc4_dev_priv *); -static void dscc4_timer(unsigned long); static void dscc4_tx_timeout(struct net_device *); static irqreturn_t dscc4_irq(int irq, void *dev_id); static int dscc4_hdlc_attach(struct net_device *, unsigned short, unsigned short); @@ -983,19 +980,6 @@ err_out: return ret; }; -/* FIXME: get rid of the unneeded code */ -static void dscc4_timer(unsigned long data) -{ - struct net_device *dev = (struct net_device *)data; - struct dscc4_dev_priv *dpriv = dscc4_priv(dev); -// struct dscc4_pci_priv *ppriv; - - goto done; -done: - dpriv->timer.expires = jiffies + TX_TIMEOUT; - add_timer(&dpriv->timer); -} - static void dscc4_tx_timeout(struct net_device *dev) { /* FIXME: something is missing there */ @@ -1127,9 +1111,6 @@ static int dscc4_open(struct net_device *dev) done: netif_start_queue(dev); - setup_timer(&dpriv->timer, dscc4_timer, (unsigned long)dev); - dpriv->timer.expires = jiffies + 10*HZ; - add_timer(&dpriv->timer); netif_carrier_on(dev); return 0; @@ -1197,7 +1178,6 @@ static int dscc4_close(struct net_device *dev) { struct dscc4_dev_priv *dpriv = dscc4_priv(dev); - del_timer_sync(&dpriv->timer); netif_stop_queue(dev); scc_patchl(PowerUp | Vis, 0, dpriv, dev, CCR0); |