renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

PCI/PM: Avoid exporting __pci_complete_power_transition()

Browse Source 
Notice that radeon_set_suspend(), which is the only caller of
__pci_complete_power_transition() outside of pci.c, really only
cares about the pci_platform_power_transition() invoked by it,
so export the latter instead of it, update the radeon driver to
call pci_platform_power_transition() directly and make
__pci_complete_power_transition() static.

Code rearrangement, no intentional functional impact.

Link: https://lore.kernel.org/r/1731661.ykamz2Tiuf@kreacher
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Rafael J. Wysocki 2019-11-05 11:30:36 +01:00 committed by Bjorn Helgaas
parent dc2256b073
commit d6aa37cd04
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/pci.c
View File

@ -963,7 +963,7 @@ void pci_refresh_power_state(struct pci_dev *dev)
* @dev: PCI device to handle. * @dev: PCI device to handle.
* @state: State to put the device into. * @state: State to put the device into.
*/ */
static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state) int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
{ {
int error; int error;
@ -979,6 +979,7 @@ static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
return error; return error;
} }
EXPORT_SYMBOL_GPL(pci_platform_power_transition);
/** /**
* pci_wakeup - Wake up a PCI device * pci_wakeup - Wake up a PCI device
@ -1061,7 +1062,7 @@ void pci_bus_set_current_state(struct pci_bus *bus, pci_power_t state)
* *
* This function should not be called directly by device drivers. * This function should not be called directly by device drivers.
*/ */
int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state) static int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state)
{ {
int ret; int ret;
@ -1073,7 +1074,6 @@ int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state)
pci_bus_set_current_state(dev->subordinate, PCI_D3cold); pci_bus_set_current_state(dev->subordinate, PCI_D3cold);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(__pci_complete_power_transition);
/** /**
* pci_set_power_state - Set the power state of a PCI device * pci_set_power_state - Set the power state of a PCI device

2
drivers/video/fbdev/aty/radeon_pm.c
View File

@ -2593,7 +2593,7 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
* calling pci_set_power_state() * calling pci_set_power_state()
*/ */
radeonfb_whack_power_state(rinfo, PCI_D2); radeonfb_whack_power_state(rinfo, PCI_D2);
__pci_complete_power_transition(rinfo->pdev, PCI_D2); pci_platform_power_transition(rinfo->pdev, PCI_D2);
} else { } else {
printk(KERN_DEBUG "radeonfb (%s): switching to D0 state...\n", printk(KERN_DEBUG "radeonfb (%s): switching to D0 state...\n",
pci_name(rinfo->pdev)); pci_name(rinfo->pdev));

2
include/linux/pci.h
View File

@ -1228,7 +1228,7 @@ struct pci_cap_saved_state *pci_find_saved_ext_cap(struct pci_dev *dev,
int pci_add_cap_save_buffer(struct pci_dev *dev, char cap, unsigned int size); int pci_add_cap_save_buffer(struct pci_dev *dev, char cap, unsigned int size);
int pci_add_ext_cap_save_buffer(struct pci_dev *dev, int pci_add_ext_cap_save_buffer(struct pci_dev *dev,
u16 cap, unsigned int size); u16 cap, unsigned int size);
int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state); int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state);
int pci_set_power_state(struct pci_dev *dev, pci_power_t state); int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
bool pci_pme_capable(struct pci_dev *dev, pci_power_t state); bool pci_pme_capable(struct pci_dev *dev, pci_power_t state);