[PATCH 9/24][Resend] ACPI / hotplug / PCI: Drop acpiphp_bus_trim()
From: Rafael J. Wysocki
If trim_stale_devices() calls acpi_bus_trim() directly, we can
save a potentially costly acpi_bus_get_device() invocation. After
making that change acpiphp_bus_trim() would only be called from one
place, so move the code from it to that place and drop it.
Signed-off-by: Rafael J. Wysocki
Tested-by: Mika Westerberg
---
drivers/pci/hotplug/acpiphp_glue.c | 30 +++---
1 file changed, 11 insertions(+), 19 deletions(-)
Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
===
--- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
@@ -489,19 +489,6 @@ static unsigned char acpiphp_max_busnr(s
}
/**
- * acpiphp_bus_trim - Trim device objects in an ACPI namespace subtree.
- * @handle: ACPI device object handle to start from.
- */
-static void acpiphp_bus_trim(acpi_handle handle)
-{
- struct acpi_device *adev = NULL;
-
- acpi_bus_get_device(handle, );
- if (adev)
- acpi_bus_trim(adev);
-}
-
-/**
* acpiphp_bus_add - Scan ACPI namespace subtree.
* @handle: ACPI object handle to start the scan from.
*/
@@ -641,8 +628,12 @@ static void disable_slot(struct acpiphp_
if (PCI_SLOT(dev->devfn) == slot->device)
pci_stop_and_remove_bus_device(dev);
- list_for_each_entry(func, >funcs, sibling)
- acpiphp_bus_trim(func_to_handle(func));
+ list_for_each_entry(func, >funcs, sibling) {
+ struct acpi_device *adev;
+
+ if (!acpi_bus_get_device(func_to_handle(func), ))
+ acpi_bus_trim(adev);
+ }
slot->flags &= (~SLOT_ENABLED);
}
@@ -714,11 +705,12 @@ static unsigned int get_slot_status(stru
*/
static void trim_stale_devices(struct pci_dev *dev)
{
- acpi_handle handle = ACPI_HANDLE(>dev);
+ struct acpi_device *adev = ACPI_COMPANION(>dev);
struct pci_bus *bus = dev->subordinate;
bool alive = false;
- if (handle) {
+ if (adev) {
+ acpi_handle handle = adev->handle;
acpi_status status;
unsigned long long sta;
@@ -734,8 +726,8 @@ static void trim_stale_devices(struct pc
}
if (!alive) {
pci_stop_and_remove_bus_device(dev);
- if (handle)
- acpiphp_bus_trim(handle);
+ if (adev)
+ acpi_bus_trim(adev);
} else if (bus) {
struct pci_dev *child, *tmp;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 9/24][Resend] ACPI / hotplug / PCI: Drop acpiphp_bus_trim()
From: Rafael J. Wysocki rafael.j.wyso...@intel.com
If trim_stale_devices() calls acpi_bus_trim() directly, we can
save a potentially costly acpi_bus_get_device() invocation. After
making that change acpiphp_bus_trim() would only be called from one
place, so move the code from it to that place and drop it.
Signed-off-by: Rafael J. Wysocki rafael.j.wyso...@intel.com
Tested-by: Mika Westerberg mika.westerb...@linux.intel.com
---
drivers/pci/hotplug/acpiphp_glue.c | 30 +++---
1 file changed, 11 insertions(+), 19 deletions(-)
Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
===
--- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
@@ -489,19 +489,6 @@ static unsigned char acpiphp_max_busnr(s
}
/**
- * acpiphp_bus_trim - Trim device objects in an ACPI namespace subtree.
- * @handle: ACPI device object handle to start from.
- */
-static void acpiphp_bus_trim(acpi_handle handle)
-{
- struct acpi_device *adev = NULL;
-
- acpi_bus_get_device(handle, adev);
- if (adev)
- acpi_bus_trim(adev);
-}
-
-/**
* acpiphp_bus_add - Scan ACPI namespace subtree.
* @handle: ACPI object handle to start the scan from.
*/
@@ -641,8 +628,12 @@ static void disable_slot(struct acpiphp_
if (PCI_SLOT(dev-devfn) == slot-device)
pci_stop_and_remove_bus_device(dev);
- list_for_each_entry(func, slot-funcs, sibling)
- acpiphp_bus_trim(func_to_handle(func));
+ list_for_each_entry(func, slot-funcs, sibling) {
+ struct acpi_device *adev;
+
+ if (!acpi_bus_get_device(func_to_handle(func), adev))
+ acpi_bus_trim(adev);
+ }
slot-flags = (~SLOT_ENABLED);
}
@@ -714,11 +705,12 @@ static unsigned int get_slot_status(stru
*/
static void trim_stale_devices(struct pci_dev *dev)
{
- acpi_handle handle = ACPI_HANDLE(dev-dev);
+ struct acpi_device *adev = ACPI_COMPANION(dev-dev);
struct pci_bus *bus = dev-subordinate;
bool alive = false;
- if (handle) {
+ if (adev) {
+ acpi_handle handle = adev-handle;
acpi_status status;
unsigned long long sta;
@@ -734,8 +726,8 @@ static void trim_stale_devices(struct pc
}
if (!alive) {
pci_stop_and_remove_bus_device(dev);
- if (handle)
- acpiphp_bus_trim(handle);
+ if (adev)
+ acpi_bus_trim(adev);
} else if (bus) {
struct pci_dev *child, *tmp;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
