kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI ACPI: Drop the second argument of platform_pci_choose_state

Browse source 
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>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Rafael J. Wysocki 2008-06-05 01:16:37 +02:00 committed by Len Brown
parent 06166780eb
commit 8d2bdf4948
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/pci/pci-acpi.c
View file

@ -293,8 +293,7 @@ EXPORT_SYMBOL(pci_osc_control_set);
* choose highest power _SxD or any lower power * choose highest power _SxD or any lower power
*/ */
static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev, static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
pm_message_t state)
{ {
int acpi_state; int acpi_state;

4
drivers/pci/pci.c
View file

@ -508,7 +508,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
return 0; 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 * 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; return PCI_D0;
if (platform_pci_choose_state) { if (platform_pci_choose_state) {
ret = platform_pci_choose_state(dev, state); ret = platform_pci_choose_state(dev);
if (ret != PCI_POWER_ERROR) if (ret != PCI_POWER_ERROR)
return ret; return ret;
} }

3
drivers/pci/pci.h
View 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); extern void pci_cleanup_rom(struct pci_dev *dev);
/* Firmware callbacks */ /* Firmware callbacks */
extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev);
pm_message_t state);
extern int (*platform_pci_set_power_state)(struct pci_dev *dev, extern int (*platform_pci_set_power_state)(struct pci_dev *dev,
pci_power_t state); pci_power_t state);