summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-03-11 08:46:56 +0800
committerDavid S. Miller <davem@davemloft.net>2017-03-12 23:47:16 -0700
commit0329b7daff75eddcf1df2eecf2cf97a91c33d0ee (patch)
tree6f2191bf30731a34da044a1da117ea0b9ab5db89
parentd1523099419990fce4360e828d5d0120360ad7ae (diff)
downloadop-kernel-dev-0329b7daff75eddcf1df2eecf2cf97a91c33d0ee.zip
op-kernel-dev-0329b7daff75eddcf1df2eecf2cf97a91c33d0ee.tar.gz
ambassador: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/ambassador.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 4a61079..906705e 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2267,9 +2267,8 @@ static int amb_probe(struct pci_dev *pci_dev,
dev->atm_dev->ci_range.vpi_bits = NUM_VPI_BITS;
dev->atm_dev->ci_range.vci_bits = NUM_VCI_BITS;
- init_timer(&dev->housekeeping);
- dev->housekeeping.function = do_housekeeping;
- dev->housekeeping.data = (unsigned long) dev;
+ setup_timer(&dev->housekeeping, do_housekeeping,
+ (unsigned long)dev);
mod_timer(&dev->housekeeping, jiffies);
// enable host interrupts
OpenPOWER on IntegriCloud