Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80a6da1 authored Jun 05, 2008 by Rafael J. Wysocki Committed by Andi Kleen Jul 16, 2008

PCI ACPI: Drop the second argument of platform_pci_choose_state



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>

parent 2fe2de5f

drivers/pci/pci-acpi.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;

drivers/pci/pci.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

drivers/pci/pci.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);