PCI ACPI: Drop the second argument of platform_pci_choose_state

[mv-sheeva.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 468d13e1458e3f586bf9dac4f7b9ddc206dff521..dab9d471914c3dacd3fd6f165ed8bd1a6ca60c56 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -60,9 +60,15 @@ acpi_query_osc (
        union acpi_object       *out_obj;
        u32                     osc_dw0;
        acpi_status *ret_status = (acpi_status *)retval;
-       struct acpi_osc_data *osc_data = acpi_get_osc_data(handle);
+       struct acpi_osc_data *osc_data;
        u32 flags = (unsigned long)context, temp;
+       acpi_handle tmp;
+
+       status = acpi_get_handle(handle, "_OSC", &tmp);
+       if (ACPI_FAILURE(status))
+               return status;
 
+       osc_data = acpi_get_osc_data(handle);
        if (!osc_data) {
                printk(KERN_ERR "acpi osc data array is full\n");
                return AE_ERROR;
@@ -232,8 +238,14 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
        acpi_status     status;
        u32             ctrlset;
-       struct acpi_osc_data *osc_data = acpi_get_osc_data(handle);
+       acpi_handle tmp;
+       struct acpi_osc_data *osc_data;
+
+       status = acpi_get_handle(handle, "_OSC", &tmp);
+       if (ACPI_FAILURE(status))
+               return status;
 
+       osc_data = acpi_get_osc_data(handle);
        if (!osc_data) {
                printk(KERN_ERR "acpi osc data array is full\n");
                return AE_ERROR;
@@ -281,13 +293,11 @@ 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;
 
-       acpi_state = acpi_pm_device_sleep_state(&pdev->dev,
-               device_may_wakeup(&pdev->dev), NULL);
+       acpi_state = acpi_pm_device_sleep_state(&pdev->dev, NULL);
        if (acpi_state < 0)
                return PCI_POWER_ERROR;