Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2009be0 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c37631c7

drivers/net/wan/dscc4.c

+0 −20
Original line number Diff line number Diff line
@@ -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 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr) 
	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);