diff options
| author | Josh Boyer <jwboyer@gmail.com> | 2012-05-03 20:13:13 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@gmail.com> | 2012-05-03 20:13:13 -0400 |
| commit | dce4c92d69db53ed0e09191428f17ac9a14ad248 (patch) | |
| tree | c197932ecc194ecf1374f44cf9449e9385e25d9b /arch/powerpc/sysdev | |
| parent | 9c6b2353dfb80ae843b831c03fc53ddc5c3949ff (diff) | |
| download | linux-3.10-dce4c92d69db53ed0e09191428f17ac9a14ad248.tar.gz linux-3.10-dce4c92d69db53ed0e09191428f17ac9a14ad248.tar.bz2 linux-3.10-dce4c92d69db53ed0e09191428f17ac9a14ad248.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c index cc17f591bd6..82c6702dcba 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); |