evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: Move resource reallocation code to non-__init

Browse source 
Resource reallocation is currently done only at boot-time, but will
soon be done when host bridge is hot-added.  This patch removes the
__init annotations so the code will still be present after boot.

[bhelgaas: split __init changes out]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Yinghai Lu 2013-07-24 15:37:13 -06:00 • committed by Bjorn Helgaas
parent 928bea9648
commit ff35147cf1
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/pci/setup-bus.c
View file

@ -1297,7 +1297,7 @@ static void pci_bus_dump_resources(struct pci_bus *bus)
} }
} }
static int __init pci_bus_get_depth(struct pci_bus *bus) static int pci_bus_get_depth(struct pci_bus *bus)
{ {
int depth = 0; int depth = 0;
struct pci_dev *dev; struct pci_dev *dev;
@ -1331,7 +1331,7 @@ enum enable_type {
auto_enabled, auto_enabled,
}; };
static enum enable_type pci_realloc_enable __initdata = undefined; static enum enable_type pci_realloc_enable = undefined;
void __init pci_realloc_get_opt(char *str) void __init pci_realloc_get_opt(char *str)
{ {
if (!strncmp(str, "off", 3)) if (!strncmp(str, "off", 3))
@ -1339,13 +1339,13 @@ void __init pci_realloc_get_opt(char *str)
else if (!strncmp(str, "on", 2)) else if (!strncmp(str, "on", 2))
pci_realloc_enable = user_enabled; pci_realloc_enable = user_enabled;
} }
static bool __init pci_realloc_enabled(enum enable_type enable) static bool pci_realloc_enabled(enum enable_type enable)
{ {
return enable >= user_enabled; return enable >= user_enabled;
} }
#if defined(CONFIG_PCI_IOV) && defined(CONFIG_PCI_REALLOC_ENABLE_AUTO) #if defined(CONFIG_PCI_IOV) && defined(CONFIG_PCI_REALLOC_ENABLE_AUTO)
static int __init iov_resources_unassigned(struct pci_dev *dev, void *data) static int iov_resources_unassigned(struct pci_dev *dev, void *data)
{ {
int i; int i;
bool *unassigned = data; bool *unassigned = data;
@ -1368,7 +1368,7 @@ static int __init iov_resources_unassigned(struct pci_dev *dev, void *data)
return 0; return 0;
} }
static enum enable_type __init pci_realloc_detect(struct pci_bus *bus, static enum enable_type pci_realloc_detect(struct pci_bus *bus,
enum enable_type enable_local) enum enable_type enable_local)
{ {
bool unassigned = false; bool unassigned = false;
@ -1383,7 +1383,7 @@ static enum enable_type __init pci_realloc_detect(struct pci_bus *bus,
return enable_local; return enable_local;
} }
#else #else
static enum enable_type __init pci_realloc_detect(struct pci_bus *bus, static enum enable_type pci_realloc_detect(struct pci_bus *bus,
enum enable_type enable_local) enum enable_type enable_local)
{ {
return enable_local; return enable_local;
@ -1395,8 +1395,7 @@ static enum enable_type __init pci_realloc_detect(struct pci_bus *bus,
* second and later try will clear small leaf bridge res * second and later try will clear small leaf bridge res
* will stop till to the max deepth if can not find good one * will stop till to the max deepth if can not find good one
*/ */
static void __init static void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus)
pci_assign_unassigned_root_bus_resources(struct pci_bus *bus)
{ {
LIST_HEAD(realloc_head); /* list of resources that LIST_HEAD(realloc_head); /* list of resources that
want additional resources */ want additional resources */