From: Jiang Liu <jiang.liu@linux.intel.com>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Bjorn Helgaas <bhelgaas@google.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Hanjun Guo <hanjun.guo@linaro.org>,
Liviu Dudau <Liviu.Dudau@arm.com>,
Yijing Wang <wangyijing@huawei.com>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Jiang Liu <jiang.liu@linux.intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Yinghai Lu <yinghai@kernel.org>
Cc: Lv Zheng <lv.zheng@intel.com>,
"lenb @ kernel . org" <lenb@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org,
"x86 @ kernel . org" <x86@kernel.org>,
linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org
Subject: [Patch v5 3/6] ia64/PCI: Use common struct resource_entry to replace struct iospace_resource
Date: Tue, 9 Jun 2015 00:20:45 +0800 [thread overview]
Message-ID: <1433780448-18636-4-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1433780448-18636-1-git-send-email-jiang.liu@linux.intel.com>
Use common struct resource_entry to replace private
struct iospace_resource.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/ia64/include/asm/pci.h | 5 -----
arch/ia64/pci/pci.c | 17 ++++++++---------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 52af5ed9f60b..5c10e0ec48d4 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -83,11 +83,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
#define pci_legacy_read platform_pci_legacy_read
#define pci_legacy_write platform_pci_legacy_write
-struct iospace_resource {
- struct list_head list;
- struct resource res;
-};
-
struct pci_controller {
struct acpi_device *companion;
void *iommu;
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index d20db9e48014..b1846b891ea5 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -154,14 +154,14 @@ new_space (u64 phys_base, int sparse)
static int add_io_space(struct device *dev, struct pci_root_info *info,
struct resource_entry *entry)
{
- struct iospace_resource *iospace;
+ struct resource_entry *iospace;
struct resource *resource, *res = entry->res;
char *name;
unsigned long base, min, max, base_port;
unsigned int sparse = 0, space_nr, len;
len = strlen(info->name) + 32;
- iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);
+ iospace = resource_list_create_entry(NULL, len);
if (!iospace) {
dev_err(dev, "PCI: No memory for %s I/O port space\n",
info->name);
@@ -190,7 +190,7 @@ static int add_io_space(struct device *dev, struct pci_root_info *info,
if (space_nr == 0)
sparse = 1;
- resource = &iospace->res;
+ resource = iospace->res;
resource->name = name;
resource->flags = IORESOURCE_MEM;
resource->start = base + (sparse ? IO_SPACE_SPARSE_ENCODING(min) : min);
@@ -205,12 +205,12 @@ static int add_io_space(struct device *dev, struct pci_root_info *info,
entry->offset = base_port;
res->start = min + base_port;
res->end = max + base_port;
- list_add_tail(&iospace->list, &info->io_resources);
+ resource_list_add_tail(iospace, &info->io_resources);
return 0;
free_resource:
- kfree(iospace);
+ resource_list_free_entry(iospace);
return -ENOSPC;
}
@@ -369,12 +369,11 @@ static void add_resources(struct pci_root_info *info, struct device *dev)
static void __release_pci_root_info(struct pci_root_info *info)
{
struct resource *res;
- struct iospace_resource *iospace, *tmp;
struct resource_entry *entry, *tentry;
- list_for_each_entry_safe(iospace, tmp, &info->io_resources, list) {
- release_resource(&iospace->res);
- kfree(iospace);
+ resource_list_for_each_entry_safe(entry, tentry, &info->io_resources) {
+ release_resource(entry->res);
+ resource_list_destroy_entry(entry);
}
resource_list_for_each_entry_safe(entry, tentry, &info->resources) {
--
1.7.10.4
next prev parent reply other threads:[~2015-06-08 16:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-08 16:20 [Patch v5 0/6] Consolidate ACPI PCI root common code into ACPI core Jiang Liu
2015-06-08 16:20 ` [Patch v5 1/6] ACPI/PCI: Enhance ACPI core to support sparse IO space Jiang Liu
2015-07-29 20:37 ` Bjorn Helgaas
2015-09-09 6:38 ` Jiang Liu
2015-09-09 14:54 ` Bjorn Helgaas
2015-06-08 16:20 ` [Patch v5 2/6] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge Jiang Liu
2015-06-08 16:20 ` Jiang Liu [this message]
2015-06-08 16:20 ` [Patch v5 4/6] PCI/ACPI: Consolidate common PCI host bridge code into ACPI core Jiang Liu
2015-06-09 16:12 ` Lorenzo Pieralisi
2015-06-09 16:58 ` Jiang Liu
2015-06-10 16:48 ` Lorenzo Pieralisi
2015-06-10 17:19 ` Jiang Liu
2015-06-11 16:18 ` Lorenzo Pieralisi
2015-07-29 20:54 ` Bjorn Helgaas
2015-07-29 20:24 ` Bjorn Helgaas
2015-06-08 16:20 ` [Patch v5 5/6] x86/PCI/ACPI: Use common interface to support PCI host bridge Jiang Liu
2015-06-08 16:20 ` [Patch v5 6/6] ia64/PCI/ACPI: " Jiang Liu
2015-07-29 12:17 ` [Patch v5 0/6] Consolidate ACPI PCI root common code into ACPI core Hanjun Guo
2015-07-29 20:30 ` Bjorn Helgaas
2015-07-30 7:58 ` Jiang Liu
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=1433780448-18636-4-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=Liviu.Dudau@arm.com \
--cc=bhelgaas@google.com \
--cc=fenghua.yu@intel.com \
--cc=hanjun.guo@linaro.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=lv.zheng@intel.com \
--cc=marc.zyngier@arm.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=tony.luck@intel.com \
--cc=wangyijing@huawei.com \
--cc=x86@kernel.org \
--cc=yinghai@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).