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

Commit ae3e24fd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-setup_timer' 



Allen Pais says:

====================
net: use setup_timer() helper function.

 This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 908a23ef 19569c88

drivers/net/appletalk/cops.c

+1 −3
Original line number Diff line number Diff line
@@ -424,9 +424,7 @@ static int cops_open(struct net_device *dev) 
		 */

		if(lp->board==TANGENT)	/* Poll 20 times per second */

		{

		    init_timer(&cops_timer);

		    cops_timer.function = cops_poll;

		    cops_timer.data 	= (unsigned long)dev;

		    setup_timer(&cops_timer, cops_poll, (unsigned long)dev);

		    cops_timer.expires 	= jiffies + HZ/20;

		    add_timer(&cops_timer);

		}

drivers/net/appletalk/ltpc.c

+1 −3
Original line number Diff line number Diff line
@@ -1165,9 +1165,7 @@ struct net_device * __init ltpc_probe(void) 
		dev->irq = 0;

		/* polled mode -- 20 times per second */

		/* this is really, really slow... should it poll more often? */

		init_timer(&ltpc_timer);

		ltpc_timer.function=ltpc_poll;

		ltpc_timer.data = (unsigned long) dev;

		setup_timer(&ltpc_timer, ltpc_poll, (unsigned long)dev);



		ltpc_timer.expires = jiffies + HZ/20;

		add_timer(&ltpc_timer);

drivers/net/arcnet/arcnet.c

+1 −3
Original line number Diff line number Diff line
@@ -450,9 +450,7 @@ struct net_device *alloc_arcdev(const char *name) 


		lp->dev = dev;

		spin_lock_init(&lp->lock);

		init_timer(&lp->timer);

		lp->timer.data = (unsigned long) dev;

		lp->timer.function = arcnet_timer;

		setup_timer(&lp->timer, arcnet_timer, (unsigned long)dev);

	}



	return dev;

drivers/net/caif/caif_hsi.c

+6 −9
Original line number Diff line number Diff line
@@ -1211,17 +1211,14 @@ static int cfhsi_open(struct net_device *ndev) 
	init_waitqueue_head(&cfhsi->flush_fifo_wait);



	/* Setup the inactivity timer. */

	init_timer(&cfhsi->inactivity_timer);

	cfhsi->inactivity_timer.data = (unsigned long)cfhsi;

	cfhsi->inactivity_timer.function = cfhsi_inactivity_tout;

	setup_timer(&cfhsi->inactivity_timer, cfhsi_inactivity_tout,

		    (unsigned long)cfhsi);

	/* Setup the slowpath RX timer. */

	init_timer(&cfhsi->rx_slowpath_timer);

	cfhsi->rx_slowpath_timer.data = (unsigned long)cfhsi;

	cfhsi->rx_slowpath_timer.function = cfhsi_rx_slowpath;

	setup_timer(&cfhsi->rx_slowpath_timer, cfhsi_rx_slowpath,

		    (unsigned long)cfhsi);

	/* Setup the aggregation timer. */

	init_timer(&cfhsi->aggregation_timer);

	cfhsi->aggregation_timer.data = (unsigned long)cfhsi;

	cfhsi->aggregation_timer.function = cfhsi_aggregation_tout;

	setup_timer(&cfhsi->aggregation_timer, cfhsi_aggregation_tout,

		    (unsigned long)cfhsi);



	/* Activate HSI interface. */

	res = cfhsi->ops->cfhsi_up(cfhsi->ops);

drivers/net/can/grcan.c

+4 −6
Original line number Diff line number Diff line
@@ -1626,13 +1626,11 @@ static int grcan_setup_netdev(struct platform_device *ofdev, 
	spin_lock_init(&priv->lock);



	if (priv->need_txbug_workaround) {

		init_timer(&priv->rr_timer);

		priv->rr_timer.function = grcan_running_reset;

		priv->rr_timer.data = (unsigned long)dev;

		setup_timer(&priv->rr_timer, grcan_running_reset,

			    (unsigned long)dev);



		init_timer(&priv->hang_timer);

		priv->hang_timer.function = grcan_initiate_running_reset;

		priv->hang_timer.data = (unsigned long)dev;

		setup_timer(&priv->hang_timer, grcan_initiate_running_reset,

			    (unsigned long)dev);

	}



	netif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);