Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe05725f authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent fd3b0c1e

arch/x86/pci/acpi.c

+2 −5
Original line number Diff line number Diff line
@@ -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);