diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/pci-acpi.c | 3 | ||||
-rw-r--r-- | drivers/pci/pci.c | 4 | ||||
-rw-r--r-- | drivers/pci/pci.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index caabf0573c3d..dab9d471914c 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
@@ -293,8 +293,7 @@ EXPORT_SYMBOL(pci_osc_control_set); | |||
293 | * choose highest power _SxD or any lower power | 293 | * choose highest power _SxD or any lower power |
294 | */ | 294 | */ |
295 | 295 | ||
296 | static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev, | 296 | static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) |
297 | pm_message_t state) | ||
298 | { | 297 | { |
299 | int acpi_state; | 298 | int acpi_state; |
300 | 299 | ||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e4548ab2a93c..75c60239cadd 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -508,7 +508,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
508 | return 0; | 508 | return 0; |
509 | } | 509 | } |
510 | 510 | ||
511 | pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); | 511 | pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev); |
512 | 512 | ||
513 | /** | 513 | /** |
514 | * pci_choose_state - Choose the power state of a PCI device | 514 | * 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) | |||
528 | return PCI_D0; | 528 | return PCI_D0; |
529 | 529 | ||
530 | if (platform_pci_choose_state) { | 530 | if (platform_pci_choose_state) { |
531 | ret = platform_pci_choose_state(dev, state); | 531 | ret = platform_pci_choose_state(dev); |
532 | if (ret != PCI_POWER_ERROR) | 532 | if (ret != PCI_POWER_ERROR) |
533 | return ret; | 533 | return ret; |
534 | } | 534 | } |
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 0a497c1b4227..ff30b3c91aad 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -6,8 +6,7 @@ extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); | |||
6 | extern void pci_cleanup_rom(struct pci_dev *dev); | 6 | extern void pci_cleanup_rom(struct pci_dev *dev); |
7 | 7 | ||
8 | /* Firmware callbacks */ | 8 | /* Firmware callbacks */ |
9 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, | 9 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev); |
10 | pm_message_t state); | ||
11 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, | 10 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, |
12 | pci_power_t state); | 11 | pci_power_t state); |
13 | 12 | ||