diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-01 09:49:04 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-01 09:49:04 -0400 |
| commit | 37b7a97884ba64bf7d403351ac2a9476ab4f1bba (patch) | |
| tree | 1c738f6b97c9f82b96c8ae836ab38f34faa4c1d7 /arch/sh/drivers | |
| parent | e2781ac2a63011dd883e94c07eb086e6f2a5f521 (diff) | |
| download | linux-37b7a97884ba64bf7d403351ac2a9476ab4f1bba.tar.bz2 | |
sh: machvec IO death.
This takes a bit of a sledgehammer to the machvec I/O routines. The
iomem case requires no special casing and so can just be dropped
outright. This only leaves the ioport casing for PCI and SuperIO
mangling. With the SuperIO case going through the standard ioport
mapping, it's possible to replace everything with generic routines.
With this done the standard I/O routines are tidied up and NO_IOPORT
now gets default-enabled for the vast majority of boards.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 60ee09a4e121..a09c77dd09db 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -382,14 +382,13 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev, struct pci_channel *chan = dev->sysdata; if (unlikely(!chan->io_map_base)) { - chan->io_map_base = generic_io_base; + chan->io_map_base = sh_io_port_base; if (pci_domains_supported) panic("To avoid data corruption io_map_base MUST be " "set with multiple PCI domains."); } - return (void __iomem *)(chan->io_map_base + port); } |