From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linux PCI <linux-pci@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Aaron Lu <aaron.lu@intel.com>
Subject: [PATCH 3/4] ACPI / bind: Redefine acpi_get_child()
Date: Mon, 25 Nov 2013 01:12:45 +0100 [thread overview]
Message-ID: <1530243.8AySlVFSvm@vostro.rjw.lan> (raw)
In-Reply-To: <2610478.KxPMyuOMok@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since acpi_get_child() is the only user of acpi_find_child() now,
drop the static inline definition of the former and redefine the
latter as new acpi_get_child().
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/glue.c | 6 +++---
include/acpi/acpi_bus.h | 6 +-----
2 files changed, 4 insertions(+), 8 deletions(-)
Index: linux-pm/drivers/acpi/glue.c
===================================================================
--- linux-pm.orig/drivers/acpi/glue.c
+++ linux-pm/drivers/acpi/glue.c
@@ -147,16 +147,16 @@ struct acpi_device *acpi_find_child_devi
return ret;
}
-acpi_handle acpi_find_child(acpi_handle handle, u64 addr, bool is_bridge)
+acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
{
struct acpi_device *parent;
if (!handle || acpi_bus_get_device(handle, &parent))
return NULL;
- return acpi_find_child_device(parent, addr, is_bridge);
+ return acpi_find_child_device(parent, addr, false);
}
-EXPORT_SYMBOL_GPL(acpi_find_child);
+EXPORT_SYMBOL_GPL(acpi_get_child);
static void acpi_physnode_link_name(char *buf, unsigned int node_id)
{
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
--- linux-pm.orig/include/acpi/acpi_bus.h
+++ linux-pm/include/acpi/acpi_bus.h
@@ -436,11 +436,7 @@ struct acpi_pci_root {
struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
u64 address, bool check_children);
-acpi_handle acpi_find_child(acpi_handle, u64, bool);
-static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
-{
- return acpi_find_child(handle, addr, false);
-}
+acpi_handle acpi_get_child(acpi_handle handle, u64 addr);
void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr);
int acpi_is_root_bridge(acpi_handle);
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
next prev parent reply other threads:[~2013-11-25 0:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 0:09 [PATCH 0/4] ACPI / bind: Simplify child devices lookup Rafael J. Wysocki
2013-11-25 0:10 ` [PATCH 1/4] ACPI / bind: Simplify child device lookups Rafael J. Wysocki
2013-11-25 0:12 ` [PATCH 2/4] PCI / ACPI: Use acpi_find_child_device() for child devices lookup Rafael J. Wysocki
2013-11-25 0:12 ` Rafael J. Wysocki [this message]
2013-11-25 0:14 ` [PATCH 4/4] ACPI / bind: Redefine acpi_preset_companion() Rafael J. Wysocki
2013-11-25 3:17 ` [PATCH 0/4] ACPI / bind: Simplify child devices lookup Aaron Lu
2013-11-27 0:00 ` Toshi Kani
2013-11-27 0:27 ` Rafael J. Wysocki
2013-11-27 0:33 ` Toshi Kani
2013-11-27 1:02 ` Rafael J. Wysocki
2013-11-27 1:11 ` Toshi Kani
2013-11-27 1:32 ` Rafael J. Wysocki
2013-11-27 1:40 ` Toshi Kani
2013-11-27 1:58 ` Rafael J. Wysocki
2013-11-29 0:27 ` Rafael J. Wysocki
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=1530243.8AySlVFSvm@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=aaron.lu@intel.com \
--cc=bhelgaas@google.com \
--cc=linux-acpi@vger.kernel.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).