x86/PCI: fix unused variable warning in amd_bus.c
Fix this warning:
arch/x86/pci/amd_bus.c: In function 'early_fill_mp_bus_info':
arch/x86/pci/amd_bus.c:56:6: warning: unused variable 'j' [-Wunused-variable]
introduced by commit d28e5ac2a0
("x86/PCI: dynamically allocate
pci_root_info for native host bridge drivers").
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
parent
29473ec23a
commit
0f1103e40f
|
@ -44,6 +44,15 @@ static struct pci_root_info __init *find_pci_root_info(int node, int link)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __init set_mp_bus_range_to_node(int min_bus, int max_bus, int node)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_NUMA
|
||||||
|
int j;
|
||||||
|
|
||||||
|
for (j = min_bus; j <= max_bus; j++)
|
||||||
|
set_mp_bus_to_node(j, node);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* early_fill_mp_bus_to_node()
|
* early_fill_mp_bus_to_node()
|
||||||
* called before pcibios_scan_root and pci_scan_bus
|
* called before pcibios_scan_root and pci_scan_bus
|
||||||
|
@ -53,7 +62,6 @@ static struct pci_root_info __init *find_pci_root_info(int node, int link)
|
||||||
static int __init early_fill_mp_bus_info(void)
|
static int __init early_fill_mp_bus_info(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int j;
|
|
||||||
unsigned bus;
|
unsigned bus;
|
||||||
unsigned slot;
|
unsigned slot;
|
||||||
int node;
|
int node;
|
||||||
|
@ -109,10 +117,7 @@ static int __init early_fill_mp_bus_info(void)
|
||||||
min_bus = (reg >> 16) & 0xff;
|
min_bus = (reg >> 16) & 0xff;
|
||||||
max_bus = (reg >> 24) & 0xff;
|
max_bus = (reg >> 24) & 0xff;
|
||||||
node = (reg >> 4) & 0x07;
|
node = (reg >> 4) & 0x07;
|
||||||
#ifdef CONFIG_NUMA
|
set_mp_bus_range_to_node(min_bus, max_bus, node);
|
||||||
for (j = min_bus; j <= max_bus; j++)
|
|
||||||
set_mp_bus_to_node(j, node);
|
|
||||||
#endif
|
|
||||||
link = (reg >> 8) & 0x03;
|
link = (reg >> 8) & 0x03;
|
||||||
|
|
||||||
info = alloc_pci_root_info(min_bus, max_bus, node, link);
|
info = alloc_pci_root_info(min_bus, max_bus, node, link);
|
||||||
|
|
Loading…
Reference in New Issue