From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 09/11] x86, PCI: embed name acpi version pci_root_info struct
Date: Mon, 27 Feb 2012 18:03:49 -0800 [thread overview]
Message-ID: <1330394631-28978-10-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330394631-28978-1-git-send-email-yinghai@kernel.org>
Now We allocate info, and keep that in during whole life of hostbridge.
So don't allocate info->name seperately, just put name into struct.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/pci/acpi.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 208f257..7538fad 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;
@@ -307,7 +307,6 @@ static void add_resources(struct pci_root_info *info,
static void free_pci_root_info(struct pci_root_info *info)
{
- kfree(info->name);
kfree(info->res);
kfree(info);
}
@@ -357,9 +356,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);
--
1.7.7
next prev parent reply other threads:[~2012-02-28 2:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 2:03 [PATCH -v2 00/11] PCI: pci_host_bridge related cleanup Yinghai Lu
2012-02-28 2:03 ` [PATCH 01/11] PCI: Separate host_bridge code out from probe.c Yinghai Lu
2012-02-28 2:03 ` [PATCH 02/11] x86, PCI: have own version for pcibios_bus_to_resource Yinghai Lu
2012-02-28 2:03 ` [PATCH 03/11] x86, PCI: Fix memleak with get_current_resources Yinghai Lu
2012-02-28 2:03 ` [PATCH 04/11] PCI: rename pci_host_bridge() to find_pci_root_bridge() Yinghai Lu
2012-02-28 2:03 ` [PATCH 05/11] PCI: add generic device into pci_host_bridge struct Yinghai Lu
2012-02-28 2:03 ` [PATCH 06/11] PCI: add host bridge release support Yinghai Lu
2012-02-28 2:03 ` [PATCH 07/11] x86, PCI: break down get_current_resource() Yinghai Lu
2012-02-28 2:03 ` [PATCH 08/11] x86, PCI: add host bridge resource release for using _CRS Yinghai Lu
2012-02-28 2:03 ` Yinghai Lu [this message]
2012-02-28 2:03 ` [PATCH 10/11] x86, PCI: Allocating pci_root_info for nocrs path Yinghai Lu
2012-02-28 2:03 ` [PATCH 11/11] x86, PCI: Merge root info printing " Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330394631-28978-10-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).