Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0db38cea authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0e751481

arch/sh/drivers/pci/ops-sh4.c

+0 −22
Original line number Diff line number Diff line
@@ -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. */

arch/sh/drivers/pci/ops-sh5.c

+0 −20
Original line number Diff line number Diff line
@@ -22,26 +22,6 @@ 
#include <asm/io.h>

#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)

{