Commit 24b390aa authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Remove unused "pci_probe" flags 



The following flags are only used on x86, but they got copied to FR-V,
MN10300, and SuperH:

  PCI_PROBE_BIOS
  PCI_PROBE_CONF1
  PCI_PROBE_CONF2
  PCI_ASSIGN_ROMS
  PCI_NO_CHECKS
  PCI_BIOS_IRQ_SCAN
  PCI_ASSIGN_ALL_BUSSES

FR-V and MN10300 do test for PCI_ASSIGN_ROMS, but they never set it, so
it's dead code.

Remove the unused flags above.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7aa6ca4d

arch/frv/mb93090-mb00/pci-frv.c

+0 −8
Original line number Diff line number Diff line
@@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void) 
			if (!r->start && r->end)

				pci_assign_resource(dev, idx);

		}



		if (pci_probe & PCI_ASSIGN_ROMS) {

			r = &dev->resource[PCI_ROM_RESOURCE];

			r->end -= r->start;

			r->start = 0;

			if (r->end)

				pci_assign_resource(dev, PCI_ROM_RESOURCE);

		}

	}

}

arch/frv/mb93090-mb00/pci-frv.h

+0 −8
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ 
#define DBG(x...)

#endif



#define PCI_PROBE_BIOS		0x0001

#define PCI_PROBE_CONF1		0x0002

#define PCI_PROBE_CONF2		0x0004

#define PCI_NO_CHECKS		0x0400

#define PCI_ASSIGN_ROMS		0x1000

#define PCI_BIOS_IRQ_SCAN	0x2000

#define PCI_ASSIGN_ALL_BUSSES	0x4000



extern unsigned int __nongpreldata pci_probe;



/* pci-frv.c */

arch/mn10300/unit-asb2305/pci-asb2305.c

+10 −12
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static int __init pcibios_assign_resources(void) 
	struct pci_dev *dev = NULL;

	struct resource *r;



	if (!(pci_probe & PCI_ASSIGN_ROMS)) {

	/* Try to use BIOS settings for ROMs, otherwise let

	   pci_assign_unassigned_resources() allocate the new

	   addresses. */
@@ -196,7 +195,6 @@ static int __init pcibios_assign_resources(void) 
			r->start = 0;

		}

	}

	}



	pci_assign_unassigned_resources();

arch/mn10300/unit-asb2305/pci-asb2305.h

+0 −7
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 
#define DBG(x...)

#endif



#define PCI_PROBE_BIOS 1

#define PCI_PROBE_CONF1 2

#define PCI_PROBE_CONF2 4

#define PCI_NO_CHECKS 0x400

#define PCI_ASSIGN_ROMS 0x1000

#define PCI_BIOS_IRQ_SCAN 0x2000



extern unsigned int pci_probe;



/* pci-asb2305.c */

arch/sh/drivers/pci/pci-sh4.h

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 


#include <asm/io.h>



/* startup values */

#define PCI_PROBE_BIOS		1

#define PCI_PROBE_CONF1		2

#define PCI_PROBE_CONF2		4

#define PCI_NO_CHECKS		0x400

#define PCI_ASSIGN_ROMS		0x1000

#define PCI_BIOS_IRQ_SCAN	0x2000



#define SH4_PCICR		0x100		/* PCI Control Register */

  #define SH4_PCICR_PREFIX	  0xA5000000	/* CR prefix for write */

  #define SH4_PCICR_FTO		  0x00000400	/* TRDY/IRDY Enable */

CRA Git | Maintained and supported by SUSTech CRA and CCSE