From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:13:02 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_free_rx_ring X-Git-Tag: firefly_0821_release~176^2~802^2~1687 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=694f9d30f7ec55e3b1f0b3418b4c472e4b7e38f8;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_free_rx_ring Use naming schema found in other rtlwifi devices. Rename rtl8192_free_rx_ring to _rtl92e_free_rx_ring. 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 e456e189c0ac..7690577f5ede 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1574,7 +1574,7 @@ void rtl92e_tx_enable(struct net_device *dev) } -static void rtl8192_free_rx_ring(struct net_device *dev) +static void _rtl92e_free_rx_ring(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); int i, rx_queue_idx; @@ -1907,7 +1907,7 @@ static short _rtl92e_pci_initdescring(struct net_device *dev) return 0; err_free_rings: - rtl8192_free_rx_ring(dev); + _rtl92e_free_rx_ring(dev); for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) if (priv->tx_ring[i].desc) rtl8192_free_tx_ring(dev, i); @@ -2715,7 +2715,7 @@ static void _rtl92e_pci_disconnect(struct pci_dev *pdev) priv->pFirmware = NULL; } destroy_workqueue(priv->priv_wq); - rtl8192_free_rx_ring(dev); + _rtl92e_free_rx_ring(dev); for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) rtl8192_free_tx_ring(dev, i);