From 7d997a9f95d2b4a14521d1631b3cf5225f49c355 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 20 Apr 2009 19:54:47 +0900 Subject: [PATCH] --- yaml --- r: 146668 b: refs/heads/master c: 0db38cea69fc478a5c25b3c915ec680cc5538783 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/ops-sh4.c | 22 ---------------------- trunk/arch/sh/drivers/pci/ops-sh5.c | 20 -------------------- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/[refs] b/[refs] index c483c16b1f72..f1245be475d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e75148108914062cb46ad3dc8f054a628018df7 +refs/heads/master: 0db38cea69fc478a5c25b3c915ec680cc5538783 diff --git a/trunk/arch/sh/drivers/pci/ops-sh4.c b/trunk/arch/sh/drivers/pci/ops-sh4.c index 7cc1fccf1c52..78bebebdc99c 100644 --- a/trunk/arch/sh/drivers/pci/ops-sh4.c +++ b/trunk/arch/sh/drivers/pci/ops-sh4.c @@ -130,28 +130,6 @@ int __init sh4_pci_check_direct(struct pci_channel *chan) return -EINVAL; } -/* Handle generic fixups */ -static void __init pci_fixup_ide_bases(struct pci_dev *d) -{ - int i; - - /* - * PCI IDE controllers use non-standard I/O port decoding, respect it. - */ - if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) - return; - pr_debug("PCI: IDE base address fixup for %s\n", pci_name(d)); - for(i = 0; i < 4; i++) { - struct resource *r = &d->resource[i]; - - if ((r->start & ~0x80) == 0x374) { - r->start |= 2; - r->end = r->start; - } - } -} -DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); - int __attribute__((weak)) pci_fixup_pcic(struct pci_channel *chan) { /* Nothing to do. */ diff --git a/trunk/arch/sh/drivers/pci/ops-sh5.c b/trunk/arch/sh/drivers/pci/ops-sh5.c index b10e2d5f4251..4ce95a001b80 100644 --- a/trunk/arch/sh/drivers/pci/ops-sh5.c +++ b/trunk/arch/sh/drivers/pci/ops-sh5.c @@ -22,26 +22,6 @@ #include #include "pci-sh5.h" -static void __init pci_fixup_ide_bases(struct pci_dev *d) -{ - int i; - - /* - * PCI IDE controllers use non-standard I/O port decoding, respect it. - */ - if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) - return; - printk("PCI: IDE base address fixup for %s\n", pci_name(d)); - for(i=0; i<4; i++) { - struct resource *r = &d->resource[i]; - if ((r->start & ~0x80) == 0x374) { - r->start |= 2; - r->end = r->start; - } - } -} -DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); - static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val) {