diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-06 15:47:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-06 15:47:16 -0700 |
| commit | fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68 (patch) | |
| tree | d22d2d97d4b32d2428c2a8b7edcc6f4c36ee0433 /arch | |
| parent | 3a4986955c0d9806e96a9d738ef7c40cb0cdaba3 (diff) | |
| parent | 8cfaf45367d41400ce99e1757ab5690d1fc94dbc (diff) | |
| download | op-kernel-dev-fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68.zip op-kernel-dev-fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] IP32: Enable PCI bridges
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/pci/ops-mace.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c index 8008e31..2025f1f 100644 --- a/arch/mips/pci/ops-mace.c +++ b/arch/mips/pci/ops-mace.c @@ -29,22 +29,20 @@ * 4 N/C */ -#define chkslot(_bus,_devfn) \ -do { \ - if ((_bus)->number > 0 || PCI_SLOT (_devfn) < 1 \ - || PCI_SLOT (_devfn) > 3) \ - return PCIBIOS_DEVICE_NOT_FOUND; \ -} while (0) +static inline int mkaddr(struct pci_bus *bus, unsigned int devfn, + unsigned int reg) +{ + return ((bus->number & 0xff) << 16) | + (devfn & 0xff) << 8) | + (reg & 0xfc); +} -#define mkaddr(_devfn, _reg) \ -((((_devfn) & 0xffUL) << 8) | ((_reg) & 0xfcUL)) static int mace_pci_read_config(struct pci_bus *bus, unsigned int devfn, int reg, int size, u32 *val) { - chkslot(bus, devfn); - mace->pci.config_addr = mkaddr(devfn, reg); + mace->pci.config_addr = mkaddr(bus, devfn, reg); switch (size) { case 1: *val = mace->pci.config_data.b[(reg & 3) ^ 3]; @@ -66,8 +64,7 @@ static int mace_pci_write_config(struct pci_bus *bus, unsigned int devfn, int reg, int size, u32 val) { - chkslot(bus, devfn); - mace->pci.config_addr = mkaddr(devfn, reg); + mace->pci.config_addr = mkaddr(bus, devfn, reg); switch (size) { case 1: mace->pci.config_data.b[(reg & 3) ^ 3] = val; |
