summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/acpi.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-04-03 03:31:53 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-04-30 22:52:43 +0200
commitfe05725ff97530e26109a0c3d52cef7fff326e15 (patch)
tree7be6854dbfb4912cbd58aaa6e18a9af63c100f74 /arch/x86/pci/acpi.c
parentx86/PCI: add host bridge resource release for _CRS path (diff)
downloadlinux-fe05725ff97530e26109a0c3d52cef7fff326e15.tar.xz
linux-fe05725ff97530e26109a0c3d52cef7fff326e15.zip
x86/PCI: embed name into pci_root_info struct
We now keep the pci_root_info struct for the entire lifetime of the host bridge, so just embed the name in the struct rather than allocating it separately. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r--arch/x86/pci/acpi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 2b74a161d215..23e7361b1747 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -9,7 +9,7 @@
struct pci_root_info {
struct acpi_device *bridge;
- char *name;
+ char name[16];
unsigned int res_num;
struct resource *res;
int busnum;
@@ -317,7 +317,6 @@ static void add_resources(struct pci_root_info *info,
static void free_pci_root_info_res(struct pci_root_info *info)
{
- kfree(info->name);
kfree(info->res);
info->res = NULL;
info->res_num = 0;
@@ -370,9 +369,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
if (!info->res)
return;
- info->name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
- if (!info->name)
- return;
+ sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum);
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
info);