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

Commit 9aa4e7b1 authored by Kumar Gala's avatar Kumar Gala Committed by Benjamin Herrenschmidt
Browse files

powerpc/pci: Remove redundant pcnet32 fixup 



The pcnet32 driver has had in its device id table for some time a match
against the "broken" vendor ID.  No need to fake out the vendor ID
with an explicit fixup.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent cf6692c0

arch/powerpc/kernel/pci_32.c

+0 −11
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ int pcibios_assign_bus_offset = 1; 


void pcibios_make_OF_bus_map(void);



static void fixup_broken_pcnet32(struct pci_dev* dev);

static void fixup_cpc710_pci64(struct pci_dev* dev);

#ifdef CONFIG_PPC_OF

static u8* pci_to_OF_bus_map;
@@ -71,16 +70,6 @@ fixup_hide_host_resource_fsl(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl); 

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl); 



static void

fixup_broken_pcnet32(struct pci_dev* dev)

{

	if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {

		dev->vendor = PCI_VENDOR_ID_AMD;

		pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT,	PCI_ANY_ID,			fixup_broken_pcnet32);



static void

fixup_cpc710_pci64(struct pci_dev* dev)

{

arch/powerpc/kernel/pci_64.c

+0 −10
Original line number Diff line number Diff line
@@ -43,16 +43,6 @@ unsigned long pci_probe_only = 1; 
unsigned long pci_io_base = ISA_IO_BASE;

EXPORT_SYMBOL(pci_io_base);



static void fixup_broken_pcnet32(struct pci_dev* dev)

{

	if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {

		dev->vendor = PCI_VENDOR_ID_AMD;

		pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);





static u32 get_int_prop(struct device_node *np, const char *name, u32 def)

{

	const u32 *prop;