From 202732e98b4f0e1360a54e831bacd70baf338922 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 5 Jun 2008 01:16:37 +0200
Subject: [PATCH] --- yaml --- r: 102002 b: refs/heads/master c:
 a80a6da145bab8ee77af304961fc926de7a8ac84 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pci/pci-acpi.c | 3 +--
 trunk/drivers/pci/pci.c      | 4 ++--
 trunk/drivers/pci/pci.h      | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 234d97fb4d14..8dd3dc1e7818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fe2de5f6c283a7d2a82c1b99a19012079cee555
+refs/heads/master: a80a6da145bab8ee77af304961fc926de7a8ac84
diff --git a/trunk/drivers/pci/pci-acpi.c b/trunk/drivers/pci/pci-acpi.c
index caabf0573c3d..dab9d471914c 100644
--- a/trunk/drivers/pci/pci-acpi.c
+++ b/trunk/drivers/pci/pci-acpi.c
@@ -293,8 +293,7 @@ EXPORT_SYMBOL(pci_osc_control_set);
  * 	choose highest power _SxD or any lower power
  */
 
-static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
-	pm_message_t state)
+static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
 {
 	int acpi_state;
 
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index e4548ab2a93c..75c60239cadd 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -508,7 +508,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 	return 0;
 }
 
-pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
+pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev);
  
 /**
  * pci_choose_state - Choose the power state of a PCI device
@@ -528,7 +528,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
 		return PCI_D0;
 
 	if (platform_pci_choose_state) {
-		ret = platform_pci_choose_state(dev, state);
+		ret = platform_pci_choose_state(dev);
 		if (ret != PCI_POWER_ERROR)
 			return ret;
 	}
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index 00408c97e5fc..312daff834b6 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -6,8 +6,7 @@ extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);
 
 /* Firmware callbacks */
-extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev,
-						pm_message_t state);
+extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev);
 extern int (*platform_pci_set_power_state)(struct pci_dev *dev,
 						pci_power_t state);