tree 5d5c0dcce27927c55f06ab2689ed0cf7ce3bf00e
parent fa9cd547e097df4966b8bd5c94aeed953e32b14d
author Len Brown <[EMAIL PROTECTED]> Thu, 24 Mar 2005 02:16:03 -0500
committer Len Brown <[EMAIL PROTECTED]> Tue, 12 Jul 2005 07:54:14 -0400
[ACPI] gut acpi_pci_choose_state() to avoid conflict
with pending pm_message_t re-definition.
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
drivers/pci/pci-acpi.c | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1,6 +1,6 @@
/*
* File: pci-acpi.c
- * Purpose: Provde PCI support in ACPI
+ * Purpose: Provide PCI support in ACPI
*
* Copyright (C) 2005 David Shaohua Li <[EMAIL PROTECTED]>
* Copyright (C) 2004 Tom Long Nguyen <[EMAIL PROTECTED]>
@@ -237,19 +237,8 @@ EXPORT_SYMBOL(pci_osc_control_set);
static int acpi_pci_choose_state(struct pci_dev *pdev, pm_message_t state)
{
- char dstate_str[] = "_S0D";
- acpi_status status;
- unsigned long val;
- struct device *dev = &pdev->dev;
-
- /* Fixme: the check is wrong after pm_message_t is a struct */
- if ((state >= PM_SUSPEND_MAX) || !DEVICE_ACPI_HANDLE(dev))
- return -EINVAL;
- dstate_str[2] += state; /* _S1D, _S2D, _S3D, _S4D */
- status = acpi_evaluate_integer(DEVICE_ACPI_HANDLE(dev), dstate_str,
- NULL, &val);
- if (ACPI_SUCCESS(status))
- return val;
+ /* TBD */
+
return -ENODEV;
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
