OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa0c728
)
drivers: net: et131x: use setup_timer() helper.
author
Allen Pais
<allen.lkml@gmail.com>
Thu, 21 Sep 2017 17:04:30 +0000
(22:34 +0530)
committer
David S. Miller
<davem@davemloft.net>
Thu, 21 Sep 2017 18:44:39 +0000
(11:44 -0700)
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/agere/et131x.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/agere/et131x.c
b/drivers/net/ethernet/agere/et131x.c
index
54eff90
..
658e92f
100644
(file)
--- a/
drivers/net/ethernet/agere/et131x.c
+++ b/
drivers/net/ethernet/agere/et131x.c
@@
-3624,11
+3624,10
@@
static int et131x_open(struct net_device *netdev)
int result;
/* Start the timer to track NIC errors */
- init_timer(&adapter->error_timer);
+ setup_timer(&adapter->error_timer, et131x_error_timer_handler,
+ (unsigned long)adapter);
adapter->error_timer.expires = jiffies +
msecs_to_jiffies(TX_ERROR_PERIOD);
- adapter->error_timer.function = et131x_error_timer_handler;
- adapter->error_timer.data = (unsigned long)adapter;
add_timer(&adapter->error_timer);
result = request_irq(irq, et131x_isr,