diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:54:47 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:54:47 -0400 |
commit | 0db38cea69fc478a5c25b3c915ec680cc5538783 (patch) | |
tree | 53abb8b1ed4299adcffc647e5a20a2d98a108b18 | |
parent | 0e75148108914062cb46ad3dc8f054a628018df7 (diff) |
sh: pci: Kill off legacy ide quirks.
These fixups seem to have bitrotted a bit since their introduction in the
2.4 days. As we never had much use for them in the first place, and
nothing is using them any more, kill them off the rest of the way.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/drivers/pci/ops-sh4.c | 22 | ||||
-rw-r--r-- | arch/sh/drivers/pci/ops-sh5.c | 20 |
2 files changed, 0 insertions, 42 deletions
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c index 7cc1fccf1c5..78bebebdc99 100644 --- a/arch/sh/drivers/pci/ops-sh4.c +++ b/arch/sh/drivers/pci/ops-sh4.c | |||
@@ -130,28 +130,6 @@ int __init sh4_pci_check_direct(struct pci_channel *chan) | |||
130 | return -EINVAL; | 130 | return -EINVAL; |
131 | } | 131 | } |
132 | 132 | ||
133 | /* Handle generic fixups */ | ||
134 | static void __init pci_fixup_ide_bases(struct pci_dev *d) | ||
135 | { | ||
136 | int i; | ||
137 | |||
138 | /* | ||
139 | * PCI IDE controllers use non-standard I/O port decoding, respect it. | ||
140 | */ | ||
141 | if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) | ||
142 | return; | ||
143 | pr_debug("PCI: IDE base address fixup for %s\n", pci_name(d)); | ||
144 | for(i = 0; i < 4; i++) { | ||
145 | struct resource *r = &d->resource[i]; | ||
146 | |||
147 | if ((r->start & ~0x80) == 0x374) { | ||
148 | r->start |= 2; | ||
149 | r->end = r->start; | ||
150 | } | ||
151 | } | ||
152 | } | ||
153 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); | ||
154 | |||
155 | int __attribute__((weak)) pci_fixup_pcic(struct pci_channel *chan) | 133 | int __attribute__((weak)) pci_fixup_pcic(struct pci_channel *chan) |
156 | { | 134 | { |
157 | /* Nothing to do. */ | 135 | /* Nothing to do. */ |
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c index b10e2d5f425..4ce95a001b8 100644 --- a/arch/sh/drivers/pci/ops-sh5.c +++ b/arch/sh/drivers/pci/ops-sh5.c | |||
@@ -22,26 +22,6 @@ | |||
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include "pci-sh5.h" | 23 | #include "pci-sh5.h" |
24 | 24 | ||
25 | static void __init pci_fixup_ide_bases(struct pci_dev *d) | ||
26 | { | ||
27 | int i; | ||
28 | |||
29 | /* | ||
30 | * PCI IDE controllers use non-standard I/O port decoding, respect it. | ||
31 | */ | ||
32 | if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) | ||
33 | return; | ||
34 | printk("PCI: IDE base address fixup for %s\n", pci_name(d)); | ||
35 | for(i=0; i<4; i++) { | ||
36 | struct resource *r = &d->resource[i]; | ||
37 | if ((r->start & ~0x80) == 0x374) { | ||
38 | r->start |= 2; | ||
39 | r->end = r->start; | ||
40 | } | ||
41 | } | ||
42 | } | ||
43 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); | ||
44 | |||
45 | static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where, | 25 | static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where, |
46 | int size, u32 *val) | 26 | int size, u32 *val) |
47 | { | 27 | { |