Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86/PCI: MMCONFIG: count MCFG structures with local variable

Browse source 
Use a local variable, not pci_mmcfg_config_num, to count MCFG entries.
No functional change, but simplifies future changes.

Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2009-11-13 17:33:42 -07:00 • committed by Jesse Barnes
parent 5663b1b963
commit e823d6ff58
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/x86/pci/mmconfig-shared.c
View file

@ -555,7 +555,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
{ {
struct acpi_table_mcfg *mcfg; struct acpi_table_mcfg *mcfg;
unsigned long i; unsigned long i;
int config_size; int entries, config_size;
if (!header) if (!header)
return -EINVAL; return -EINVAL;
@ -564,17 +564,18 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
/* how many config structures do we have */ /* how many config structures do we have */
pci_mmcfg_config_num = 0; pci_mmcfg_config_num = 0;
entries = 0;
i = header->length - sizeof(struct acpi_table_mcfg); i = header->length - sizeof(struct acpi_table_mcfg);
while (i >= sizeof(struct acpi_mcfg_allocation)) { while (i >= sizeof(struct acpi_mcfg_allocation)) {
++pci_mmcfg_config_num; entries++;
i -= sizeof(struct acpi_mcfg_allocation); i -= sizeof(struct acpi_mcfg_allocation);
}; };
if (pci_mmcfg_config_num == 0) { if (entries == 0) {
printk(KERN_ERR PREFIX "MMCONFIG has no entries\n"); printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
return -ENODEV; return -ENODEV;
} }
config_size = pci_mmcfg_config_num * sizeof(*pci_mmcfg_config); config_size = entries * sizeof(*pci_mmcfg_config);
pci_mmcfg_config = kmalloc(config_size, GFP_KERNEL); pci_mmcfg_config = kmalloc(config_size, GFP_KERNEL);
if (!pci_mmcfg_config) { if (!pci_mmcfg_config) {
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
@ -583,8 +584,9 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
} }
memcpy(pci_mmcfg_config, &mcfg[1], config_size); memcpy(pci_mmcfg_config, &mcfg[1], config_size);
pci_mmcfg_config_num = entries;
for (i = 0; i < pci_mmcfg_config_num; ++i) { for (i = 0; i < entries; i++) {
if (acpi_mcfg_check_entry(mcfg, &pci_mmcfg_config[i])) { if (acpi_mcfg_check_entry(mcfg, &pci_mmcfg_config[i])) {
kfree(pci_mmcfg_config); kfree(pci_mmcfg_config);
pci_mmcfg_config_num = 0; pci_mmcfg_config_num = 0;