]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
PCI ACPI: Drop the second argument of platform_pci_choose_state
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 4 Jun 2008 23:16:37 +0000 (01:16 +0200)
committerAndi Kleen <andi@basil.nowhere.org>
Wed, 16 Jul 2008 21:27:02 +0000 (23:27 +0200)
Since the second argument of acpi_pci_choose_state() and
platform_pci_choose_state() is never used, remove it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/pci/pci-acpi.c
drivers/pci/pci.c
drivers/pci/pci.h

index caabf0573c3d242a8e6a9889910f89d91f76703f..dab9d471914c3dacd3fd6f165ed8bd1a6ca60c56 100644 (file)
@@ -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;
 
index e4548ab2a93c1d148f8100262671a6ad4a04f52a..75c60239cadd035d967677d60e662b5a23e360fe 100644 (file)
@@ -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;
        }
index 00408c97e5fc8cc2e38f52b408c70fdab9d133a8..312daff834b62c86387ad8043640e0cb306b602f 100644 (file)
@@ -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);