xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook
2017-10-25 03:51:14 -07:00
committed by David S. Miller
parent 0ff624fbfe
commit 550acfb37f
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/can/usb/peak_usb/pcan_usb.c
View File

@@ -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: