aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-15 06:15:56 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-10-15 06:15:56 +0900
commita80be1680502f99de5f9565c491208e90a9a3afe (patch)
tree987116f70cca17e598ed61fd01aecabe0d36c631 /arch/sh/drivers
parentd8d6b902b8a3b2c66151529694bb4a9a3555cf43 (diff)
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>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r--arch/sh/drivers/pci/pcie-sh7786.c4
-rw-r--r--arch/sh/drivers/pci/pcie-sh7786.h7
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
index ae0b2c9b70a..96e9b058aa1 100644
--- a/arch/sh/drivers/pci/pcie-sh7786.c
+++ b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -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;
diff --git a/arch/sh/drivers/pci/pcie-sh7786.h b/arch/sh/drivers/pci/pcie-sh7786.h
index a2a0ca6e7cc..1ee054e47ea 100644
--- a/arch/sh/drivers/pci/pcie-sh7786.h
+++ b/arch/sh/drivers/pci/pcie-sh7786.h
@@ -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)
{