summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@gmail.com>2012-05-03 20:13:13 -0400
committerJosh Boyer <jwboyer@gmail.com>2012-05-03 20:13:13 -0400
commitdce4c92d69db53ed0e09191428f17ac9a14ad248 (patch)
treec197932ecc194ecf1374f44cf9449e9385e25d9b /arch/powerpc/sysdev
parent9c6b2353dfb80ae843b831c03fc53ddc5c3949ff (diff)
downloadop-kernel-dev-dce4c92d69db53ed0e09191428f17ac9a14ad248.zip
op-kernel-dev-dce4c92d69db53ed0e09191428f17ac9a14ad248.tar.gz
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 <jwboyer@gmail.com>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r--arch/powerpc/sysdev/ppc4xx_msi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
index cc17f59..82c6702 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);
OpenPOWER on IntegriCloud