From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:12:53 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_up X-Git-Tag: firefly_0821_release~176^2~802^2~1696 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1665a67be1d39a32c2a023f32c9f74279bd1508;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_up Use naming schema found in other rtlwifi devices. Rename rtl8192_up to _rtl92e_try_up. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index d625d8933427..20f4daafd757 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -100,7 +100,7 @@ static void _rtl92e_irq_tx_tasklet(struct r8192_priv *priv); static void _rtl92e_irq_rx_tasklet(struct r8192_priv *priv); static void rtl8192_cancel_deferred_work(struct r8192_priv *priv); static int _rtl8192_up(struct net_device *dev, bool is_silent_reset); -static int rtl8192_up(struct net_device *dev); +static int _rtl92e_try_up(struct net_device *dev); static int _rtl92e_down(struct net_device *dev, bool shutdownrf); static void _rtl92e_restart(void *data); @@ -2194,13 +2194,13 @@ static int _rtl92e_open(struct net_device *dev) int ret; down(&priv->wx_sem); - ret = rtl8192_up(dev); + ret = _rtl92e_try_up(dev); up(&priv->wx_sem); return ret; } -static int rtl8192_up(struct net_device *dev) +static int _rtl92e_try_up(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev);