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

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

drivers/net: can: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Allen Pais <allen.lkml@gmail.com>
Cc: linux-can@vger.kernel.org
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 0ff624fb

drivers/net/can/grcan.c

+8 −11
Original line number Diff line number Diff line
@@ -807,10 +807,10 @@ static irqreturn_t grcan_interrupt(int irq, void *dev_id) 
 * is not ONGOING (TX might be stuck in ONGOING due to a harwrware bug

 * for single shot)

 */

static void grcan_running_reset(unsigned long data)

static void grcan_running_reset(struct timer_list *t)

{

	struct net_device *dev = (struct net_device *)data;

	struct grcan_priv *priv = netdev_priv(dev);

	struct grcan_priv *priv = from_timer(priv, t, rr_timer);

	struct net_device *dev = priv->dev;

	struct grcan_registers __iomem *regs = priv->regs;

	unsigned long flags;
@@ -898,10 +898,10 @@ static inline void grcan_reset_timer(struct timer_list *timer, __u32 bitrate) 
}



/* Disable channels and schedule a running reset */

static void grcan_initiate_running_reset(unsigned long data)

static void grcan_initiate_running_reset(struct timer_list *t)

{

	struct net_device *dev = (struct net_device *)data;

	struct grcan_priv *priv = netdev_priv(dev);

	struct grcan_priv *priv = from_timer(priv, t, hang_timer);

	struct net_device *dev = priv->dev;

	struct grcan_registers __iomem *regs = priv->regs;

	unsigned long flags;
@@ -1626,11 +1626,8 @@ static int grcan_setup_netdev(struct platform_device *ofdev, 
	spin_lock_init(&priv->lock);



	if (priv->need_txbug_workaround) {

		setup_timer(&priv->rr_timer, grcan_running_reset,

			    (unsigned long)dev);



		setup_timer(&priv->hang_timer, grcan_initiate_running_reset,

			    (unsigned long)dev);

		timer_setup(&priv->rr_timer, grcan_running_reset, 0);

		timer_setup(&priv->hang_timer, grcan_initiate_running_reset, 0);

	}



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

drivers/net/can/sja1000/peak_pcmcia.c

+3 −3
Original line number Diff line number Diff line
@@ -381,9 +381,9 @@ static inline void pcan_set_can_power(struct pcan_pccard *card, int onoff) 
/*

 * set leds state according to channel activity

 */

static void pcan_led_timer(unsigned long arg)

static void pcan_led_timer(struct timer_list *t)

{

	struct pcan_pccard *card = (struct pcan_pccard *)arg;

	struct pcan_pccard *card = from_timer(card, t, led_timer);

	struct net_device *netdev;

	int i, up_count = 0;

	u8 ccr;
@@ -692,7 +692,7 @@ static int pcan_probe(struct pcmcia_device *pdev) 
	}



	/* init the timer which controls the leds */

	setup_timer(&card->led_timer, pcan_led_timer, (unsigned long)card);

	timer_setup(&card->led_timer, pcan_led_timer, 0);



	/* request the given irq */

	err = request_irq(pdev->irq, &pcan_isr, IRQF_SHARED, PCC_NAME, card);

drivers/net/can/usb/peak_usb/pcan_usb.c

+6 −4
Original line number Diff line number Diff line
@@ -259,10 +259,13 @@ static int pcan_usb_write_mode(struct peak_usb_device *dev, u8 onoff) 
/*

 * handle end of waiting for the device to reset

 */

static void pcan_usb_restart(unsigned long arg)

static void pcan_usb_restart(struct timer_list *t)

{

	struct pcan_usb *pdev = from_timer(pdev, t, restart_timer);

	struct peak_usb_device *dev = &pdev->dev;



	/* notify candev and netdev */

	peak_usb_restart_complete((struct peak_usb_device *)arg);

	peak_usb_restart_complete(dev);

}



/*
@@ -798,8 +801,7 @@ static int pcan_usb_init(struct peak_usb_device *dev) 
	int err;



	/* initialize a timer needed to wait for hardware restart */

	setup_timer(&pdev->restart_timer, pcan_usb_restart,

		    (unsigned long)dev);

	timer_setup(&pdev->restart_timer, pcan_usb_restart, 0);



	/*

	 * explicit use of dev_xxx() instead of netdev_xxx() here: