diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-03 16:07:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:38 -0700 |
| commit | b8bd14b9123b44f53013995914b86f44a55fa272 (patch) | |
| tree | 7f23d222ffa99986677a0c38d390a8ef3b150fb3 /drivers/staging/rtl8192su | |
| parent | f063ba768e4e9096c4f8502446fb0838d557402c (diff) | |
Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su')
| -rw-r--r-- | drivers/staging/rtl8192su/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192S_phy.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192su/r8192U_core.c | 3 |
4 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index 784d96f60928..fb026f12d461 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile @@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 EXTRA_CFLAGS += -DDISABLE_BB_RF=0 EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c index 9e7f95774226..0d4bcc8ec4ff 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c @@ -330,13 +330,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) #ifndef RTL8192SE ieee->InitialGainHandler(ieee->dev,IG_Backup); #endif -#if(RTL8192S_DISABLE_FW_DM == 0) if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_HALT); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_DISABLE); } -#endif if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { b40M = 1; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset; @@ -361,13 +359,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) #ifndef RTL8192SE ieee->InitialGainHandler(ieee->dev,IG_Restore); #endif -#if(RTL8192S_DISABLE_FW_DM == 0) if (ieee->SetFwCmdHandler) { ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_RESUME); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_ENABLE); } -#endif ieee->state = IEEE80211_LINKED; ieee->link_change(ieee->dev); // To prevent the immediately calling watch_dog after scan. diff --git a/drivers/staging/rtl8192su/r8192S_phy.c b/drivers/staging/rtl8192su/r8192S_phy.c index 36f5e247c91c..b8586e64585d 100644 --- a/drivers/staging/rtl8192su/r8192S_phy.c +++ b/drivers/staging/rtl8192su/r8192S_phy.c @@ -3074,7 +3074,6 @@ PHY_ScanOperationBackup8192S( -#if(RTL8192S_DISABLE_FW_DM == 0) if(!Adapter->bDriverStopped) { @@ -3103,7 +3102,6 @@ PHY_ScanOperationBackup8192S( break; } } -#endif } #endif diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 908adc2534f7..21d9d76bbeba 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c @@ -7014,9 +7014,6 @@ start: // rtl8192SU_MacConfigAfterFwDownload(dev); -#if (RTL8192S_DISABLE_FW_DM == 1) - write_nic_dword(dev, WFM5, FW_DM_DISABLE); -#endif //priv->bLbusEnable = TRUE; //if(priv->RegRfOff == TRUE) // priv->eRFPowerState = eRfOff; |