diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-10-21 22:44:42 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:12 -0800 |
| commit | ca58fb303757d73876af32238d86091c59b88507 (patch) | |
| tree | 24117d224f7eca513dfdce7bc4336f36c9c71471 /drivers/staging/rt2860/common | |
| parent | Staging: rt28x0: remove optional loading of EEPROM from file in eFuse mode (diff) | |
| download | linux-dev-ca58fb303757d73876af32238d86091c59b88507.tar.xz linux-dev-ca58fb303757d73876af32238d86091c59b88507.zip | |
Staging: rt28x0: fix some build warnings
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/common')
| -rw-r--r-- | drivers/staging/rt2860/common/cmm_asic.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/cmm_mac_pci.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/rtmp_init.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/rtmp_mcu.c | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/rt2860/common/cmm_asic.c b/drivers/staging/rt2860/common/cmm_asic.c index 5d3a387f76a2..406e0bbf9530 100644 --- a/drivers/staging/rt2860/common/cmm_asic.c +++ b/drivers/staging/rt2860/common/cmm_asic.c @@ -810,9 +810,9 @@ VOID AsicSwitchChannel( #if defined(RT3090) || defined(RT3390) // PCIe PHY Transmit attenuation adjustment - if (IS_RT3090A(pAd) || IS_RT3390(pAd)) - { - TX_ATTENUATION_CTRL_STRUC TxAttenuationCtrl = {0}; + if (IS_RT3090A(pAd) || IS_RT3390(pAd)) { + TX_ATTENUATION_CTRL_STRUC + TxAttenuationCtrl = { .word = 0 }; RTMP_IO_READ32(pAd, PCIE_PHY_TX_ATTENUATION_CTRL, &TxAttenuationCtrl.word); diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c index 73992cb4ee67..d910bfdbd2f3 100644 --- a/drivers/staging/rt2860/common/cmm_mac_pci.c +++ b/drivers/staging/rt2860/common/cmm_mac_pci.c @@ -1173,10 +1173,9 @@ BOOLEAN RT28xxPciAsicRadioOn( pAd->Mlme.bPsPollTimerRunning = FALSE; RTMPCancelTimer(&pAd->Mlme.PsPollTimer, &Cancelled); } - if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)&& - ((Level == GUIRADIO_OFF) || (Level == GUI_IDLE_POWER_SAVE)) - ||(RTMP_TEST_PSFLAG(pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND))) - { + if ((pAd->StaCfg.PSControl.field.EnableNewPS == TRUE && + (Level == GUIRADIO_OFF || Level == GUI_IDLE_POWER_SAVE)) || + RTMP_TEST_PSFLAG(pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND)) { // Some chips don't need to delay 6ms, so copy RTMPPCIePowerLinkCtrlRestore // return condition here. /* diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 7647c090c349..9fa853eba672 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -679,7 +679,6 @@ VOID MlmePeriodicExec( { ULONG TxTotalCnt; PRTMP_ADAPTER pAd = (RTMP_ADAPTER *)FunctionContext; - SHORT realavgrssi; #ifdef RTMP_MAC_PCI { diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index fe8327b9b13c..5deba8d698c5 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c @@ -3621,7 +3621,8 @@ INT RtmpRaDevCtrlInit( #ifdef RTMP_MAC_USB init_MUTEX(&(pAd->UsbVendorReq_semaphore)); - os_alloc_mem(pAd, (PUCHAR)&pAd->UsbVendorReqBuf, MAX_PARAM_BUFFER_SIZE - 1); + os_alloc_mem(pAd, (PUCHAR *)&pAd->UsbVendorReqBuf, + MAX_PARAM_BUFFER_SIZE - 1); if (pAd->UsbVendorReqBuf == NULL) { DBGPRINT(RT_DEBUG_ERROR, ("Allocate vendor request temp buffer failed!\n")); diff --git a/drivers/staging/rt2860/common/rtmp_mcu.c b/drivers/staging/rt2860/common/rtmp_mcu.c index 229ea05e9336..e5d19020ef7a 100644 --- a/drivers/staging/rt2860/common/rtmp_mcu.c +++ b/drivers/staging/rt2860/common/rtmp_mcu.c @@ -119,7 +119,9 @@ NDIS_STATUS RtmpAsicLoadFirmware( PUCHAR pFirmwareImage = NULL; ULONG FileLength, Index; UINT32 MacReg = 0; +#ifdef RTMP_MAC_USB UINT32 Version = (pAd->MACVersion >> 16); +#endif // New 8k byte firmware size for RT3071/RT3072 { |