dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

sh: pci: Convert to upper/lower_32_bits() helpers. 

Instead of hand-rolling our own, just use the generic ones instead.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-10-15 06:15:56 +09:00
parent d8d6b902b8
commit a80be16805
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/drivers/pci/pcie-sh7786.c
View File

@ -446,9 +446,9 @@ static int __init pcie_init(struct sh7786_pcie_port *port)
mask = (roundup_pow_of_two(size) / SZ_256K) - 1;
pci_write_reg(chan, mask << 18, SH4A_PCIEPAMR(win));
pci_write_reg(chan, RES_TO_U32_HIGH(res->start),
pci_write_reg(chan, upper_32_bits(res->start),
SH4A_PCIEPARH(win));
pci_write_reg(chan, RES_TO_U32_LOW(res->start),
pci_write_reg(chan, lower_32_bits(res->start),
SH4A_PCIEPARL(win));
mask = MASK_PARE;

7
arch/sh/drivers/pci/pcie-sh7786.h
View File

@ -568,13 +568,6 @@
#define PCI_REG(x) ((x) + 0x40000)
#define U64_TO_U32_LOW(val) ((u32)((val) & 0x00000000ffffffffULL))
#define U64_TO_U32_HIGH(val) ((u32)((val) >> 32))
#define RES_TO_U32_LOW(val) \
((sizeof(resource_size_t) > sizeof(u32)) ? U64_TO_U32_LOW(val) : (val))
#define RES_TO_U32_HIGH(val) \
((sizeof(resource_size_t) > sizeof(u32)) ? U64_TO_U32_HIGH(val) : (0))
static inline void
pci_write_reg(struct pci_channel *chan, unsigned long val, unsigned long reg)
{