brcmfmac: Fix incorrect casting of 64 bit physical address.

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / pcie.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index 905991fdb7b101a5dec4694d898a2b394cef06af..e91fa9a2c8855e37a315698d4a86c062edbfdffa 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -959,14 +959,14 @@ brcmf_pcie_init_dmabuffer_for_device(struct brcmf_pciedev_info *devinfo,
                                     dma_addr_t *dma_handle)
 {
        void *ring;
-       long long address;
+       u64 address;
 
        ring = dma_alloc_coherent(&devinfo->pdev->dev, size, dma_handle,
                                  GFP_KERNEL);
        if (!ring)
                return NULL;
 
-       address = (long long)(long)*dma_handle;
+       address = (u64)*dma_handle;
        brcmf_pcie_write_tcm32(devinfo, tcm_dma_phys_addr,
                               address & 0xffffffff);
        brcmf_pcie_write_tcm32(devinfo, tcm_dma_phys_addr + 4, address >> 32);
@@ -1166,7 +1166,7 @@ brcmf_pcie_release_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 
 static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 {
-       long long address;
+       u64 address;
        u32 addr;
 
        devinfo->shared.scratch = dma_alloc_coherent(&devinfo->pdev->dev,
@@ -1180,7 +1180,7 @@ static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 
        addr = devinfo->shared.tcm_base_address +
               BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET;
-       address = (long long)(long)devinfo->shared.scratch_dmahandle;
+       address = (u64)devinfo->shared.scratch_dmahandle;
        brcmf_pcie_write_tcm32(devinfo, addr, address & 0xffffffff);
        brcmf_pcie_write_tcm32(devinfo, addr + 4, address >> 32);
        addr = devinfo->shared.tcm_base_address +
@@ -1198,7 +1198,7 @@ static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
 
        addr = devinfo->shared.tcm_base_address +
               BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET;
-       address = (long long)(long)devinfo->shared.ringupd_dmahandle;
+       address = (u64)devinfo->shared.ringupd_dmahandle;
        brcmf_pcie_write_tcm32(devinfo, addr, address & 0xffffffff);
        brcmf_pcie_write_tcm32(devinfo, addr + 4, address >> 32);
        addr = devinfo->shared.tcm_base_address +