summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>2015-07-19 19:28:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-22 21:24:21 -0700
commitbc4f2cc90d214e81bb75c5b63a8c919779f32a6a (patch)
treee17416e287353a29e9749702a7dbf00777f76163
parent1c0a7c0e622a94eeb2da1d249757753f903eb79b (diff)
downloadtalos-obmc-linux-bc4f2cc90d214e81bb75c5b63a8c919779f32a6a.tar.gz
talos-obmc-linux-bc4f2cc90d214e81bb75c5b63a8c919779f32a6a.zip
staging: rtl8192e: Rename rtl8192_commit
Use naming schema found in other rtlwifi devices. Rename rtl8192_commit to rtl92e_commit. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/rtl_core.c4
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/rtl_core.h2
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/rtl_wx.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 64a03f314b43..a6937aa84cf0 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2276,7 +2276,7 @@ static int rtl8192_down(struct net_device *dev, bool shutdownrf)
return 0;
}
-void rtl8192_commit(struct net_device *dev)
+void rtl92e_commit(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -2296,7 +2296,7 @@ static void rtl8192_restart(void *data)
down(&priv->wx_sem);
- rtl8192_commit(dev);
+ rtl92e_commit(dev);
up(&priv->wx_sem);
}
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 5a7a54f9dc9b..65679846484c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -591,7 +591,7 @@ void rtl8192_rx_enable(struct net_device *);
void rtl8192_tx_enable(struct net_device *);
void rtl8192_hw_sleep_wq(void *data);
-void rtl8192_commit(struct net_device *dev);
+void rtl92e_commit(struct net_device *dev);
void rtl92e_check_rfctrl_gpio_timer(unsigned long data);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 1b29f14dd2b2..29400eeda968 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -824,7 +824,7 @@ static int r8192_wx_set_retry(struct net_device *dev,
}
- rtl8192_commit(dev);
+ rtl92e_commit(dev);
exit:
up(&priv->wx_sem);
OpenPOWER on IntegriCloud