| Message ID | 20131023032412.12410.9371.stgit@bhelgaas-glaptop.roam.corp.google.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Oct 22, 2013 at 9:24 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > pcibios_last_bus was apparently copied from x86. On mn10300, it is > statically initialized to -1 and may be set with the "pci=lastbus=<X>" > boot option, but it is never tested. This patch removes everything > related to pcibios_last_bus. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Applied to my pci/misc branch for v3.13. Let me know if anybody objects. > --- > arch/mn10300/unit-asb2305/pci-asb2305.h | 1 - > arch/mn10300/unit-asb2305/pci.c | 5 ----- > 2 files changed, 6 deletions(-) > > diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h > index 7fa66a0..9e17aca 100644 > --- a/arch/mn10300/unit-asb2305/pci-asb2305.h > +++ b/arch/mn10300/unit-asb2305/pci-asb2305.h > @@ -35,7 +35,6 @@ extern void pcibios_resource_survey(void); > > /* pci.c */ > > -extern int pcibios_last_bus; > extern struct pci_ops *pci_root_ops; > > extern struct irq_routing_table *pcibios_get_irq_routing_table(void); > diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c > index e37fac0..6b4339f 100644 > --- a/arch/mn10300/unit-asb2305/pci.c > +++ b/arch/mn10300/unit-asb2305/pci.c > @@ -24,7 +24,6 @@ > > unsigned int pci_probe = 1; > > -int pcibios_last_bus = -1; > struct pci_ops *pci_root_ops; > > /* > @@ -392,10 +391,6 @@ char *__init pcibios_setup(char *str) > if (!strcmp(str, "off")) { > pci_probe = 0; > return NULL; > - > - } else if (!strncmp(str, "lastbus=", 8)) { > - pcibios_last_bus = simple_strtol(str+8, NULL, 0); > - return NULL; > } > > return str; > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h index 7fa66a0..9e17aca 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.h +++ b/arch/mn10300/unit-asb2305/pci-asb2305.h @@ -35,7 +35,6 @@ extern void pcibios_resource_survey(void); /* pci.c */ -extern int pcibios_last_bus; extern struct pci_ops *pci_root_ops; extern struct irq_routing_table *pcibios_get_irq_routing_table(void); diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index e37fac0..6b4339f 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c @@ -24,7 +24,6 @@ unsigned int pci_probe = 1; -int pcibios_last_bus = -1; struct pci_ops *pci_root_ops; /* @@ -392,10 +391,6 @@ char *__init pcibios_setup(char *str) if (!strcmp(str, "off")) { pci_probe = 0; return NULL; - - } else if (!strncmp(str, "lastbus=", 8)) { - pcibios_last_bus = simple_strtol(str+8, NULL, 0); - return NULL; } return str;
pcibios_last_bus was apparently copied from x86. On mn10300, it is statically initialized to -1 and may be set with the "pci=lastbus=<X>" boot option, but it is never tested. This patch removes everything related to pcibios_last_bus. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/mn10300/unit-asb2305/pci-asb2305.h | 1 - arch/mn10300/unit-asb2305/pci.c | 5 ----- 2 files changed, 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html