Message ID | 20171124131345.31421-1-colin.king@canonical.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Series | atm: firestream: use setup_timer instead of init_timer | expand |
From: Colin King <colin.king@canonical.com> Date: Fri, 24 Nov 2017 13:13:45 +0000 > From: Colin Ian King <colin.king@canonical.com> > > Use setup_timer function instead of initializing timer with the > function and data fields. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> Likewise about setup_timer() no longer existing.
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 6b6368a56526..534001270be5 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -1885,9 +1885,7 @@ static int fs_init(struct fs_dev *dev) } #ifdef FS_POLL_FREQ - init_timer (&dev->timer); - dev->timer.data = (unsigned long) dev; - dev->timer.function = fs_poll; + setup_timer(&dev->timer, fs_poll, (unsigned long)dev); dev->timer.expires = jiffies + FS_POLL_FREQ; add_timer (&dev->timer); #endif