# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/03/23 16:16:03-05:00 len.brown@intel.com 
#   [ACPI] gut acpi_pci_choose_state() to avoid conflict
#   with pending pm_message_t re-definition.
#   
#   Signed-off-by: Len Brown <len.brown@intel.com>
# 
# drivers/pci/pci-acpi.c
#   2005/03/23 16:15:52-05:00 len.brown@intel.com +3 -14
#   gut acpi_pci_choose_state()
# 
diff -Nru a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
--- a/drivers/pci/pci-acpi.c	2005-07-09 17:35:21 -04:00
+++ b/drivers/pci/pci-acpi.c	2005-07-09 17:35:21 -04:00
@@ -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 <shaohua.li@intel.com>
  * Copyright (C) 2004 Tom Long Nguyen <tom.l.nguyen@intel.com>
@@ -237,19 +237,8 @@
 
 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;
 }