Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1187689

[PATCH 061/102] staging: rtl8192e: Rename rtl8192_irq_disable

From Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 061/102] staging: rtl8192e: Rename rtl8192_irq_disable
Date 2015-07-19 19:50 +0200
Message-ID <pO0SU-1ha-51@gated-at.bofh.it> (permalink)
References <pO0zw-TU-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Use naming schema found in other rtlwifi devices.
Rename rtl8192_irq_disable to rtl92e_irq_disable.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c |  2 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c   | 12 ++++++------
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h   |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index a21da2f..6576901 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -41,7 +41,7 @@ void rtl92e_start_beacon(struct net_device *dev)
 	u16 BcnCW = 6;
 	u16 BcnIFS = 0xf;
 
-	rtl8192_irq_disable(dev);
+	rtl92e_irq_disable(dev);
 
 	write_nic_word(dev, ATIMWND, 2);
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index b13014a..d131c02 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -309,7 +309,7 @@ void rtl8192_irq_enable(struct net_device *dev)
 	priv->ops->irq_enable(dev);
 }
 
-void rtl8192_irq_disable(struct net_device *dev)
+void rtl92e_irq_disable(struct net_device *dev)
 {
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -826,7 +826,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
 	priv->rtllib->wpa_ie = NULL;
 	rtl92e_cam_reset(dev);
 	memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
-	rtl8192_irq_disable(dev);
+	rtl92e_irq_disable(dev);
 
 	del_timer_sync(&priv->watch_dog_timer);
 	rtl8192_cancel_deferred_work(priv);
@@ -1102,7 +1102,7 @@ static short rtl8192_init(struct net_device *dev)
 		    rtl92e_check_rfctrl_gpio_timer,
 		    (unsigned long)dev);
 
-	rtl8192_irq_disable(dev);
+	rtl92e_irq_disable(dev);
 	if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,
 	    dev->name, dev)) {
 		netdev_err(dev, "Error allocating IRQ %d", dev->irq);
@@ -1301,7 +1301,7 @@ RESET_START:
 		if (!netif_queue_stopped(dev))
 			netif_stop_queue(dev);
 
-		rtl8192_irq_disable(dev);
+		rtl92e_irq_disable(dev);
 		del_timer_sync(&priv->watch_dog_timer);
 		rtl8192_cancel_deferred_work(priv);
 		deinit_hal_dm(dev);
@@ -2283,7 +2283,7 @@ void rtl92e_commit(struct net_device *dev)
 	if (priv->up == 0)
 		return;
 	rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
-	rtl8192_irq_disable(dev);
+	rtl92e_irq_disable(dev);
 	priv->ops->stop_adapter(dev, true);
 	_rtl8192_up(dev, false);
 }
@@ -2816,7 +2816,7 @@ bool rtl92e_disable_nic(struct net_device *dev)
 	rtllib_softmac_stop_protocol(priv->rtllib, 0, false);
 	priv->rtllib->state = tmp_state;
 	rtl8192_cancel_deferred_work(priv);
-	rtl8192_irq_disable(dev);
+	rtl92e_irq_disable(dev);
 
 	priv->ops->stop_adapter(dev, false);
 	RT_TRACE(COMP_PS, "<=========%s()\n", __func__);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index fe70e39..1017a06 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -597,13 +597,11 @@ void rtl92e_check_rfctrl_gpio_timer(unsigned long data);
 
 void rtl8192_hw_wakeup_wq(void *data);
 
-void rtl8192_irq_disable(struct net_device *dev);
-
 void rtl8192_pci_resetdescring(struct net_device *dev);
 void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode);
 void rtl8192_irq_enable(struct net_device *dev);
 void rtl92e_config_rate(struct net_device *dev, u16 *rate_config);
-void rtl8192_irq_disable(struct net_device *dev);
+void rtl92e_irq_disable(struct net_device *dev);
 
 void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,
 				  struct rtllib_rx_stats *stats);
-- 
1.8.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 000/102] staging: rtl8192e: Function names cleanup Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:30 +0200
  [PATCH 003/102] staging: rtl8192e: Rename PHY_SetRF8256CCKTxPower Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:30 +0200
  [PATCH 083/102] staging: rtl8192e: Rename dm_txpower_trackingcallback Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 012/102] staging: rtl8192e: Rename rtl8192_enable_tx Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 079/102] staging: rtl8192e: Rename dm_init_edca_turbo Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 075/102] staging: rtl8192e: Rename write_nic_word Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 018/102] staging: rtl8192e: Rename rtl8192_HalRxCheckStuck Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 078/102] staging: rtl8192e: Rename dm_cck_txpower_adjust Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 080/102] staging: rtl8192e: Rename dm_initialize_txpower_tracking Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 037/102] staging: rtl8192e: Rename rtl8192_phy_getTxPower Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 030/102] staging: rtl8192e: Rename PHY_ScanOperationBackup8192 Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 082/102] staging: rtl8192e: Rename dm_rf_pathcheck_workitemcallback Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 081/102] staging: rtl8192e: Rename dm_restore_dynamic_mechanism_state Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 089/102] staging: rtl8192e: Rename rtl8192E_suspend Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 074/102] staging: rtl8192e: Rename write_nic_dword Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 090/102] staging: rtl8192e: Rename IPSEnter Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 065/102] staging: rtl8192e: Rename rtl8192_rx_enable Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 052/102] staging: rtl8192e: Rename check_rfctrl_gpio_timer Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 084/102] staging: rtl8192e: Rename hal_dm_watchdog Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 043/102] staging: rtl8192e: Rename rtl8192_QueryBBReg Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 076/102] staging: rtl8192e: Rename deinit_hal_dm Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 077/102] staging: rtl8192e: Rename dm_backup_dynamic_mechanism_state Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 010/102] staging: rtl8192e: Rename rtl8192_EnableInterrupt Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 088/102] staging: rtl8192e: Rename rtl8192E_resume Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 086/102] staging: rtl8192e: Rename eprom_read Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 087/102] staging: rtl8192e: Rename rtl8192_pci_findadapter Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 085/102] staging: rtl8192e: Rename init_rate_adaptive Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:40 +0200
  [PATCH 047/102] staging: rtl8192e: Rename CamResetAllEntry Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 055/102] staging: rtl8192e: Rename NicIFEnableNIC Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 032/102] staging: rtl8192e: Rename rtl8192_BBConfig Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 041/102] staging: rtl8192e: Rename rtl8192_phy_setTxPower Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 064/102] staging: rtl8192e: Rename rtl8192_record_rxdesc_forlateruse Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 070/102] staging: rtl8192e: Rename rtl819x_translate_todbm Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 063/102] staging: rtl8192e: Rename rtl8192_pci_resetdescring Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 058/102] staging: rtl8192e: Rename read_nic_word Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 066/102] staging: rtl8192e: Rename rtl8192_SetWirelessMode Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 050/102] staging: rtl8192e: Rename setKey Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 071/102] staging: rtl8192e: Rename rtl819x_UpdateRxPktTimeStamp Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 045/102] staging: rtl8192e: Rename rtl8192_SetBWMode Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 062/102] staging: rtl8192e: Rename rtl8192_irq_enable Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 040/102] staging: rtl8192e: Rename rtl8192_phy_SetRFReg Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 072/102] staging: rtl8192e: Rename rtl819x_update_rxsignalstatistics8190pci Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 069/102] staging: rtl8192e: Rename rtl819x_query_rxpwrpercentage Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 059/102] staging: rtl8192e: Rename rtl8192_commit Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 053/102] staging: rtl8192e: Rename MgntActSet_RF_State Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 068/102] staging: rtl8192e: Rename rtl819x_evm_dbtopercentage Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 048/102] staging: rtl8192e: Rename CamRestoreAllEntry Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 061/102] staging: rtl8192e: Rename rtl8192_irq_disable Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 051/102] staging: rtl8192e: Rename set_swcam Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 060/102] staging: rtl8192e: Rename rtl8192_config_rate Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 056/102] staging: rtl8192e: Rename read_nic_byte Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 067/102] staging: rtl8192e: Rename rtl8192_tx_enable Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 042/102] staging: rtl8192e: Rename rtl8192_phy_SwChnl Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 054/102] staging: rtl8192e: Rename NicIFDisableNIC Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 046/102] staging: rtl8192e: Rename SetRFPowerState Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 039/102] staging: rtl8192e: Rename rtl8192_phy_RFConfig Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 057/102] staging: rtl8192e: Rename read_nic_dword Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 049/102] staging: rtl8192e: Rename EnableHWSecurityConfig8192 Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 038/102] staging: rtl8192e: Rename rtl8192_phy_QueryRFReg Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 19:50 +0200
  [PATCH 005/102] staging: rtl8192e: Rename cmpk_message_handle_tx Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 016/102] staging: rtl8192e: Rename rtl8192_GetHalfNmodeSupportByAPs Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 033/102] staging: rtl8192e: Rename rtl8192_phy_checkBBAndRF Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 025/102] staging: rtl8192e: Rename rtl8192_tx_fill_cmd_desc Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 022/102] staging: rtl8192e: Rename rtl8192_interrupt_recognized Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 001/102] staging: rtl8192e: Rename PHY_RF8256_Config Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 021/102] staging: rtl8192e: Rename rtl8192_InitializeVariables Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 026/102] staging: rtl8192e: Rename rtl8192_tx_fill_desc Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 006/102] staging: rtl8192e: Rename rtl8192_adapter_start Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 017/102] staging: rtl8192e: Rename rtl8192_GetNmodeSupportBySecCfg Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 024/102] staging: rtl8192e: Rename rtl8192_rx_query_status_desc Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 029/102] staging: rtl8192e: Rename InitialGain819xPci Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 027/102] staging: rtl8192e: Rename rtl8192_update_ratr_table Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 008/102] staging: rtl8192e: Rename rtl8192_ClearInterrupt Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 013/102] staging: rtl8192e: Rename rtl8192e_SetHwReg Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 011/102] staging: rtl8192e: Rename rtl8192_enable_rx Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 020/102] staging: rtl8192e: Rename rtl8192_HalTxCheckStuck Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 015/102] staging: rtl8192e: Rename rtl8192_get_eeprom_size Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 019/102] staging: rtl8192e: Rename rtl8192_halt_adapter Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 031/102] staging: rtl8192e: Rename PHY_SetRtl8192eRfOff Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 002/102] staging: rtl8192e: Rename PHY_SetRF8256Bandwidth Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 023/102] staging: rtl8192e: Rename rtl8192_link_change Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 004/102] staging: rtl8192e: Rename PHY_SetRF8256OFDMTxPower Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 035/102] staging: rtl8192e: Rename rtl8192_phy_configmac Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 034/102] staging: rtl8192e: Rename rtl8192_phy_CheckIsLegalRFPath Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 014/102] staging: rtl8192e: Rename rtl8192e_start_beacon Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 009/102] staging: rtl8192e: Rename rtl8192_DisableInterrupt Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 007/102] staging: rtl8192e: Rename rtl8192_AllowAllDestAddr Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 028/102] staging: rtl8192e: Rename firmware_init_param Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200
  [PATCH 036/102] staging: rtl8192e: Rename rtl8192_phy_ConfigRFWithHeaderFile Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-07-19 20:00 +0200

csiph-web