From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-usb@vger.kernel.org, Tejun Heo <tj@kernel.org>,
linux-ide@vger.kernel.org, Jeff Garzik <jgarzik@pobox.com>,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 2/2] ACPI / glue: Drop .find_bridge() callback from struct acpi_bus_type
Date: Thu, 28 Feb 2013 22:53:31 +0100 [thread overview]
Message-ID: <1995794.TENtrAZA5Q@vostro.rjw.lan> (raw)
In-Reply-To: <1504144.f1SBuDyFqp@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
After PCI and USB have stopped using the .find_bridge() callback in
struct acpi_bus_type, the only remaining user of it is SATA, but SATA
only pretends to be a user, because it points that callback to a stub
always returning -ENODEV.
For this reason, drop the SATA's dummy .find_bridge() callback and
remove .find_bridge(), which is not used any more, from struct
acpi_bus_type entirely.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/glue.c | 26 +-------------------------
drivers/ata/libata-acpi.c | 6 ------
include/acpi/acpi_bus.h | 3 ---
3 files changed, 1 insertion(+), 34 deletions(-)
Index: linux-pm/drivers/ata/libata-acpi.c
===================================================================
--- linux-pm.orig/drivers/ata/libata-acpi.c
+++ linux-pm/drivers/ata/libata-acpi.c
@@ -1144,14 +1144,8 @@ static int ata_acpi_find_device(struct d
return -ENODEV;
}
-static int ata_acpi_find_dummy(struct device *dev, acpi_handle *handle)
-{
- return -ENODEV;
-}
-
static struct acpi_bus_type ata_acpi_bus = {
.name = "ATA",
- .find_bridge = ata_acpi_find_dummy,
.find_device = ata_acpi_find_device,
};
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
--- linux-pm.orig/include/acpi/acpi_bus.h
+++ linux-pm/include/acpi/acpi_bus.h
@@ -439,10 +439,7 @@ struct acpi_bus_type {
struct list_head list;
const char *name;
bool (*match)(struct device *dev);
- /* For general devices under the bus */
int (*find_device) (struct device *, acpi_handle *);
- /* For bridges, such as PCI root bridge, IDE controller */
- int (*find_bridge) (struct device *, acpi_handle *);
void (*setup)(struct device *);
void (*cleanup)(struct device *);
};
Index: linux-pm/drivers/acpi/glue.c
===================================================================
--- linux-pm.orig/drivers/acpi/glue.c
+++ linux-pm/drivers/acpi/glue.c
@@ -78,22 +78,6 @@ static struct acpi_bus_type *acpi_get_bu
return ret;
}
-static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
-{
- struct acpi_bus_type *tmp;
- int ret = -ENODEV;
-
- down_read(&bus_type_sem);
- list_for_each_entry(tmp, &bus_type_list, list) {
- if (tmp->find_bridge && !tmp->find_bridge(dev, handle)) {
- ret = 0;
- break;
- }
- }
- up_read(&bus_type_sem);
- return ret;
-}
-
static acpi_status do_acpi_find_child(acpi_handle handle, u32 lvl_not_used,
void *addr_p, void **ret_p)
{
@@ -262,15 +246,7 @@ static int acpi_platform_notify(struct d
int ret;
ret = acpi_bind_one(dev, NULL);
- if (ret) {
- if (!type) {
- ret = acpi_find_bridge_device(dev, &handle);
- if (!ret)
- ret = acpi_bind_one(dev, handle);
-
- goto out;
- }
-
+ if (ret && type) {
ret = type->find_device(dev, &handle);
if (ret) {
DBG("Unable to get handle for %s\n", dev_name(dev));
next prev parent reply other threads:[~2013-02-28 21:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-27 22:06 [Resend][PATCH] ACPI / glue: Drop .find_bridge() callback from struct acpi_bus_type Rafael J. Wysocki
2013-02-27 22:20 ` Greg Kroah-Hartman
2013-02-27 23:31 ` Yinghai Lu
2013-02-28 0:23 ` Lan Tianyu
2013-02-28 1:19 ` Rafael J. Wysocki
2013-02-28 1:11 ` Rafael J. Wysocki
2013-02-28 2:33 ` Greg Kroah-Hartman
2013-02-28 21:49 ` Rafael J. Wysocki
2013-02-28 21:53 ` [PATCH 1/2] ACPI / glue: Add .match() callback to " Rafael J. Wysocki
2013-02-28 22:29 ` Yinghai Lu
2013-02-28 23:37 ` Rafael J. Wysocki
2013-03-01 5:07 ` Greg Kroah-Hartman
2013-02-28 21:53 ` Rafael J. Wysocki [this message]
2013-02-28 22:13 ` [PATCH 2/2] ACPI / glue: Drop .find_bridge() callback from " Jeff Garzik
2013-02-28 23:37 ` 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=1995794.TENtrAZA5Q@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=tj@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).