From: Josh Boyer Date: Fri, 4 May 2012 00:13:13 +0000 (-0400) Subject: powerpc/40x: Use {upper,lower}_32_bits for msi_phys X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dce4c92d69db53ed0e09191428f17ac9a14ad248;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git powerpc/40x: Use {upper,lower}_32_bits for msi_phys Fix a build error when -Werror is set: arch/powerpc/sysdev/ppc4xx_msi.c: In function ‘ppc4xx_setup_pcieh_hw’: arch/powerpc/sysdev/ppc4xx_msi.c:178:2: error: right shift count >= width of type [-Werror] Signed-off-by: Josh Boyer --- diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c index cc17f591bd66..82c6702dcbab 100644 --- a/arch/powerpc/sysdev/ppc4xx_msi.c +++ b/arch/powerpc/sysdev/ppc4xx_msi.c @@ -175,8 +175,8 @@ static int ppc4xx_setup_pcieh_hw(struct platform_device *dev, msi_virt = dma_alloc_coherent(&dev->dev, 64, &msi_phys, GFP_KERNEL); if (!msi_virt) return -ENOMEM; - msi->msi_addr_hi = (u32)(msi_phys >> 32); - msi->msi_addr_lo = (u32)(msi_phys & 0xffffffff); + msi->msi_addr_hi = upper_32_bits(msi_phys); + msi->msi_addr_lo = lower_32_bits(msi_phys & 0xffffffff); dev_dbg(&dev->dev, "PCIE-MSI: msi address high 0x%x, low 0x%x\n", msi->msi_addr_hi, msi->msi_addr_lo);