diff options
author | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
commit | ae3e24fd547e9f0b1443c1f004c29165180eb101 (patch) | |
tree | 1483ff9602b04d34cd641a223624c4514721f76e /drivers/net/ethernet/ti/cpsw_ale.c | |
parent | 908a23efb76eed04f5b5173ecf09b6cbd05d886b (diff) | |
parent | 19569c88b938145e90cc7d6ab45d7fa0edd07beb (diff) | |
download | linux-ae3e24fd547e9f0b1443c1f004c29165180eb101.tar.gz linux-ae3e24fd547e9f0b1443c1f004c29165180eb101.tar.bz2 linux-ae3e24fd547e9f0b1443c1f004c29165180eb101.zip |
Merge branch 'net-setup_timer'
Allen Pais says:
====================
net: use setup_timer() helper function.
This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw_ale.c')
-rw-r--r-- | drivers/net/ethernet/ti/cpsw_ale.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c index ddd43e09111e..cd1185e66133 100644 --- a/drivers/net/ethernet/ti/cpsw_ale.c +++ b/drivers/net/ethernet/ti/cpsw_ale.c @@ -859,9 +859,7 @@ void cpsw_ale_start(struct cpsw_ale *ale) cpsw_ale_control_set(ale, 0, ALE_ENABLE, 1); cpsw_ale_control_set(ale, 0, ALE_CLEAR, 1); - init_timer(&ale->timer); - ale->timer.data = (unsigned long)ale; - ale->timer.function = cpsw_ale_timer; + setup_timer(&ale->timer, cpsw_ale_timer, (unsigned long)ale); if (ale->ageout) { ale->timer.expires = jiffies + ale->ageout; add_timer(&ale->timer); |