PCI: rework pci_set_power_state function to call platform first

[linux-2.6-omap-h63xx.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 951021838055ef14238906f6370a05254d2861ce..6bc0d8c870afe1bbc283b873af42abc9388bebac 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -51,7 +51,8 @@ static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
        return data;
 }
 
-static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
+static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
+                         0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
 
 static acpi_status acpi_run_osc(acpi_handle handle,
                                struct acpi_osc_args *osc_args)
@@ -87,7 +88,7 @@ static acpi_status acpi_run_osc(acpi_handle handle,
                status = AE_TYPE;
                goto out_kfree;
        }
-       osc_dw0 = *((u32 *) out_obj->buffer.pointer);
+       osc_dw0 = *((u32 *)out_obj->buffer.pointer);
        if (osc_dw0) {
                if (osc_dw0 & OSC_REQUEST_ERROR)
                        printk(KERN_DEBUG "_OSC request fails\n"); 
@@ -120,7 +121,6 @@ static acpi_status acpi_query_osc(acpi_handle handle,
                                  u32 level, void *context, void **retval)
 {
        acpi_status status;
-       acpi_status *ret_status = (acpi_status *)retval;
        struct acpi_osc_data *osc_data;
        u32 flags = (unsigned long)context, support_set;
        acpi_handle tmp;
@@ -143,8 +143,6 @@ static acpi_status acpi_query_osc(acpi_handle handle,
        osc_args.capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
 
        status = acpi_run_osc(handle, &osc_args);
-       *ret_status = status;
-
        if (ACPI_SUCCESS(status)) {
                osc_data->support_set = support_set;
                osc_data->query_result = osc_args.query_result;
@@ -164,15 +162,11 @@ static acpi_status acpi_query_osc(acpi_handle handle,
  **/
 acpi_status __pci_osc_support_set(u32 flags, const char *hid)
 {
-       acpi_status retval = AE_NOT_FOUND;
-
-       if (!(flags & OSC_SUPPORT_MASKS)) {
+       if (!(flags & OSC_SUPPORT_MASKS))
                return AE_TYPE;
-       }
-       acpi_get_devices(hid,
-                       acpi_query_osc,
-                       (void *)(unsigned long)flags,
-                       (void **) &retval );
+
+       acpi_get_devices(hid, acpi_query_osc,
+                        (void *)(unsigned long)flags, NULL);
        return AE_OK;
 }
 
@@ -221,7 +215,6 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 }
 EXPORT_SYMBOL(pci_osc_control_set);
 
-#ifdef CONFIG_ACPI_SLEEP
 /*
  * _SxD returns the D-state with the highest power
  * (lowest D-state number) supported in the S-state "x".
@@ -245,13 +238,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;
 
@@ -267,7 +258,13 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
        }
        return PCI_POWER_ERROR;
 }
-#endif
+
+static bool acpi_pci_power_manageable(struct pci_dev *dev)
+{
+       acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+
+       return handle ? acpi_bus_power_manageable(handle) : false;
+}
 
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
@@ -280,12 +277,11 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
                [PCI_D3hot] = ACPI_STATE_D3,
                [PCI_D3cold] = ACPI_STATE_D3
        };
+       int error = -EINVAL;
 
-       if (!handle)
-               return -ENODEV;
        /* If the ACPI device has _EJ0, ignore the device */
-       if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
-               return 0;
+       if (!handle || ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
+               return -ENODEV;
 
        switch (state) {
        case PCI_D0:
@@ -293,11 +289,21 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
        case PCI_D2:
        case PCI_D3hot:
        case PCI_D3cold:
-               return acpi_bus_set_power(handle, state_conv[state]);
+               error = acpi_bus_set_power(handle, state_conv[state]);
        }
-       return -EINVAL;
+
+       if (!error)
+               dev_printk(KERN_INFO, &dev->dev,
+                               "power state changed by ACPI to D%d\n", state);
+
+       return error;
 }
 
+static struct pci_platform_pm_ops acpi_pci_platform_pm = {
+       .is_manageable = acpi_pci_power_manageable,
+       .set_state = acpi_pci_set_power_state,
+       .choose_state = acpi_pci_choose_state,
+};
 
 /* ACPI bus type */
 static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
@@ -349,10 +355,7 @@ static int __init acpi_pci_init(void)
        ret = register_acpi_bus_type(&acpi_pci_bus);
        if (ret)
                return 0;
-#ifdef CONFIG_ACPI_SLEEP
-       platform_pci_choose_state = acpi_pci_choose_state;
-#endif
-       platform_pci_set_power_state = acpi_pci_set_power_state;
+       pci_set_platform_pm(&acpi_pci_platform_pm);
        return 0;
 }
 arch_initcall(acpi_pci_init);