lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pci: rename __pci_reenable_device() to pci_reenable_device()

Browse Source 
Rename __pci_reenable_device() to pci_reenable_device().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo
2007-07-27 14:43:35 +09:00
committed by Jeff Garzik
parent 6fdc99a224
commit 0b62e13b5c
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/ata_piix.c
View File

@@ -973,10 +973,10 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
pci_restore_state(pdev); pci_restore_state(pdev);
/* PCI device wasn't disabled during suspend. Use /* PCI device wasn't disabled during suspend. Use
* __pci_reenable_device() to avoid affecting the * pci_reenable_device() to avoid affecting the enable
* enable count. * count.
*/ */
rc = __pci_reenable_device(pdev); rc = pci_reenable_device(pdev);
if (rc) if (rc)
dev_printk(KERN_ERR, &pdev->dev, "failed to enable " dev_printk(KERN_ERR, &pdev->dev, "failed to enable "
"device after resume (%d)\n", rc); "device after resume (%d)\n", rc);

2
drivers/pci/pci-driver.c
View File

@@ -310,7 +310,7 @@ static int pci_default_resume(struct pci_dev *pci_dev)
/* restore the PCI config space */ /* restore the PCI config space */
pci_restore_state(pci_dev); pci_restore_state(pci_dev);
/* if the device was enabled before suspend, reenable */ /* if the device was enabled before suspend, reenable */
retval = __pci_reenable_device(pci_dev); retval = pci_reenable_device(pci_dev);
/* if the device was busmaster before the suspend, make it busmaster again */ /* if the device was busmaster before the suspend, make it busmaster again */
if (pci_dev->is_busmaster) if (pci_dev->is_busmaster)
pci_set_master(pci_dev); pci_set_master(pci_dev);

7
drivers/pci/pci.c
View File

@@ -695,14 +695,13 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
} }
/** /**
* __pci_reenable_device - Resume abandoned device * pci_reenable_device - Resume abandoned device
* @dev: PCI device to be resumed * @dev: PCI device to be resumed
* *
* Note this function is a backend of pci_default_resume and is not supposed * Note this function is a backend of pci_default_resume and is not supposed
* to be called by normal code, write proper resume handler and use it instead. * to be called by normal code, write proper resume handler and use it instead.
*/ */
int int pci_reenable_device(struct pci_dev *dev)
__pci_reenable_device(struct pci_dev *dev)
{ {
if (atomic_read(&dev->enable_cnt)) if (atomic_read(&dev->enable_cnt))
return do_pci_enable_device(dev, (1 << PCI_NUM_RESOURCES) - 1); return do_pci_enable_device(dev, (1 << PCI_NUM_RESOURCES) - 1);
@@ -1604,7 +1603,7 @@ early_param("pci", pci_setup);
device_initcall(pci_init); device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars); EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(__pci_reenable_device); EXPORT_SYMBOL(pci_reenable_device);
EXPORT_SYMBOL(pci_enable_device_bars); EXPORT_SYMBOL(pci_enable_device_bars);
EXPORT_SYMBOL(pci_enable_device); EXPORT_SYMBOL(pci_enable_device);
EXPORT_SYMBOL(pcim_enable_device); EXPORT_SYMBOL(pcim_enable_device);

2
include/linux/pci.h
View File

@@ -534,7 +534,7 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
int __must_check pci_enable_device(struct pci_dev *dev); int __must_check pci_enable_device(struct pci_dev *dev);
int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask); int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
int __must_check __pci_reenable_device(struct pci_dev *); int __must_check pci_reenable_device(struct pci_dev *);
int __must_check pcim_enable_device(struct pci_dev *pdev); int __must_check pcim_enable_device(struct pci_dev *pdev);
void pcim_pin_device(struct pci_dev *pdev); void pcim_pin_device(struct pci_dev *pdev);