leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/PCI: embed pci_sysdata into pci_root_info on ACPI path

Browse Source 
Embed the x86 struct pci_sysdata in the struct pci_root_info so it
will be automatically freed in the remove path.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Yinghai Lu 2012-04-02 18:31:53 -07:00 committed by Bjorn Helgaas
parent fe05725ff9
commit 35cb05e5bd
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86/pci/acpi.c
View File

@ -13,6 +13,7 @@ struct pci_root_info {
unsigned int res_num; unsigned int res_num;
struct resource *res; struct resource *res;
int busnum; int busnum;
struct pci_sysdata sd;
}; };
static bool pci_use_crs = true; static bool pci_use_crs = true;
@ -410,26 +411,16 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
if (node != -1 && !node_online(node)) if (node != -1 && !node_online(node))
node = -1; node = -1;
/* Allocate per-root-bus (not per bus) arch-specific data. info = kzalloc(sizeof(*info), GFP_KERNEL);
* TODO: leak; this memory is never freed. if (!info) {
* It's arguable whether it's worth the trouble to care.
*/
sd = kzalloc(sizeof(*sd), GFP_KERNEL);
if (!sd) {
printk(KERN_WARNING "pci_bus %04x:%02x: " printk(KERN_WARNING "pci_bus %04x:%02x: "
"ignored (out of memory)\n", domain, busnum); "ignored (out of memory)\n", domain, busnum);
return NULL; return NULL;
} }
sd = &info->sd;
sd->domain = domain; sd->domain = domain;
sd->node = node; sd->node = node;
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) {
kfree(sd);
printk(KERN_WARNING "pci_bus %04x:%02x: "
"ignored (out of memory)\n", domain, busnum);
return NULL;
}
/* /*
* Maybe the desired pci bus has been already scanned. In such case * Maybe the desired pci bus has been already scanned. In such case
* it is unnecessary to scan the pci bus with the given domain,busnum. * it is unnecessary to scan the pci bus with the given domain,busnum.
@ -442,7 +433,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
*/ */
memcpy(bus->sysdata, sd, sizeof(*sd)); memcpy(bus->sysdata, sd, sizeof(*sd));
kfree(info); kfree(info);
kfree(sd);
} else { } else {
probe_pci_root_info(info, device, busnum, domain); probe_pci_root_info(info, device, busnum, domain);
@ -484,9 +474,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
} }
} }
if (!bus)
kfree(sd);
if (bus && node != -1) { if (bus && node != -1) {
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
if (pxm >= 0) if (pxm >= 0)