summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-03-24 22:15:12 +0800
committerCorey Minyard <cminyard@mvista.com>2017-04-07 12:25:36 -0500
commit36cb82dabb09b29cce5850ee701bedaf5c1aa89d (patch)
treea96873fd29f96b52419fc330e73eae2ee879d4cd /drivers/char
parent6de65fcfdb51835789b245203d1bfc8d14cb1e06 (diff)
ipmi_ssif: 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: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_ssif.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 51ba67de862e..0b22a9be5029 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1644,9 +1644,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
spin_lock_init(&ssif_info->lock);
ssif_info->ssif_state = SSIF_NORMAL;
- init_timer(&ssif_info->retry_timer);
- ssif_info->retry_timer.data = (unsigned long) ssif_info;
- ssif_info->retry_timer.function = retry_timeout;
+ setup_timer(&ssif_info->retry_timer, retry_timeout,
+ (unsigned long)ssif_info);
for (i = 0; i < SSIF_NUM_STATS; i++)
atomic_set(&ssif_info->stats[i], 0);