From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:19:52 +0000 (+0200) Subject: staging: rtl8192e: Rename dm_fsync_timer_callback X-Git-Tag: firefly_0821_release~176^2~802^2~1541 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c70d11cdcead2578b55d6c7bbf59b2b2e333edb1;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename dm_fsync_timer_callback Use naming schema found in other rtlwifi devices. Rename dm_fsync_timer_callback to _rtl92e_dm_fsync_timer_callback. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index c9b28dfa0f2f..4c3b2515f48c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -206,7 +206,7 @@ static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev); static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev); static void _rtl92e_dm_check_fsync(struct net_device *dev); static void _rtl92e_dm_check_rf_ctrl_gpio(void *data); -static void dm_fsync_timer_callback(unsigned long data); +static void _rtl92e_dm_fsync_timer_callback(unsigned long data); /*---------------------Define local function prototype-----------------------*/ @@ -2164,8 +2164,8 @@ static void dm_init_fsync(struct net_device *dev) priv->rtllib->fsync_state = Default_Fsync; priv->framesyncMonitor = 1; - setup_timer(&priv->fsync_timer, dm_fsync_timer_callback, - (unsigned long) dev); + setup_timer(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, + (unsigned long)dev); } @@ -2176,7 +2176,7 @@ static void _rtl92e_dm_deinit_fsync(struct net_device *dev) del_timer_sync(&priv->fsync_timer); } -static void dm_fsync_timer_callback(unsigned long data) +static void _rtl92e_dm_fsync_timer_callback(unsigned long data) { struct net_device *dev = (struct net_device *)data; struct r8192_priv *priv = rtllib_priv((struct net_device *)data);