From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:28:20 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_tx_enable X-Git-Tag: v4.3-rc1~158^2~422 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94199b35ff28093bb94f26a7a668e33becec092d;p=karo-tx-linux.git staging: rtl8192e: Rename rtl8192_tx_enable Use naming schema found in other rtlwifi devices. Rename rtl8192_tx_enable to rtl92e_tx_enable. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 2fc591f47b06..0e1b25ddc7d4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -798,7 +798,7 @@ start: NUM_OF_PAGE_IN_FW_QUEUE_PUB << RSVD_FW_QUEUE_PAGE_PUB_SHIFT); - rtl8192_tx_enable(dev); + rtl92e_tx_enable(dev); rtl92e_rx_enable(dev); ulRegRead = (0xFFF00000 & rtl92e_readl(dev, RRSR)) | RATE_ALL_OFDM_AG | RATE_ALL_CCK; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index b644ef0150e4..edb5943442e8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1585,7 +1585,7 @@ void rtl92e_rx_enable(struct net_device *dev) priv->ops->rx_enable(dev); } -void rtl8192_tx_enable(struct net_device *dev) +void rtl92e_tx_enable(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index ea8c6281c211..0decf6b9213f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -588,7 +588,7 @@ void write_nic_dword(struct net_device *dev, int x, u32 y); void force_pci_posting(struct net_device *dev); void rtl92e_rx_enable(struct net_device *); -void rtl8192_tx_enable(struct net_device *); +void rtl92e_tx_enable(struct net_device *); void rtl8192_hw_sleep_wq(void *data); void rtl92e_commit(struct net_device *dev);