aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8192u/r8192U_dm.c
diff options
context:
space:
mode:
authorGravatar Somya Anand <somyaanand214@gmail.com> 2015-03-11 17:02:16 +0530
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2015-03-16 15:54:13 +0100
commitacc6539fe6293373ded751162e77c10f532336c6 (patch)
tree8e84eaa88eb8c0bb57c26afdaccecefcaa368981 /drivers/staging/rtl8192u/r8192U_dm.c
parentStaging: rtl8192u: Review phrase and fix spelling errors (diff)
downloadlinux-acc6539fe6293373ded751162e77c10f532336c6.tar.gz
linux-acc6539fe6293373ded751162e77c10f532336c6.tar.bz2
linux-acc6539fe6293373ded751162e77c10f532336c6.zip
Staging: rtl8192u: Combine initialization using setup_timer
The function setup_timer combines the initialization of a timer with the initialization of the timer's function and data fields. So, this patch combines the multiline code for timer initialization using the function setup_timer. This issue is identified via coccinelle script. @@ expression E1, E2, E3; type T; @@ - init_timer(&E1); ... ( - E1.function = E2; ... - E1.data = (T)E3; + setup_timer(&E1, E2, (T)E3); | - E1.data = (T)E3; ... - E1.function = E2; + setup_timer(&E1, E2, (T)E3); | - E1.function = E2; + setup_timer(&E1, E2, 0); ) Signed-off-by: Somya Anand <somyaanand214@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u/r8192U_dm.c')
-rw-r--r--drivers/staging/rtl8192u/r8192U_dm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 16cafcdb26c6..4c62cb8f0065 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2681,10 +2681,8 @@ static void dm_init_fsync(struct net_device *dev)
priv->ieee80211->fsync_seconddiff_ratethreshold = 200;
priv->ieee80211->fsync_state = Default_Fsync;
priv->framesyncMonitor = 1; /* current default 0xc38 monitor on */
-
- init_timer(&priv->fsync_timer);
- priv->fsync_timer.data = (unsigned long)dev;
- priv->fsync_timer.function = dm_fsync_timer_callback;
+ setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,
+ (unsigned long)dev);
}
static void dm_deInit_fsync(struct net_device *dev)