diff options
author | Tejun Heo <htejun@gmail.com> | 2007-07-10 02:36:05 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-24 16:55:01 -0400 |
commit | f0a664bbd1839fbe9f57564983f39bfc6c6f931d (patch) | |
tree | 4b1e20d96fd44f3d3ec5ad2d292a4479638eae09 | |
parent | f695baf2df9e0413d3521661070103711545207a (diff) |
PCI: export __pci_reenable_device()
Some odd ACPI implementations choke if certain controller is disabled
when ACPI suspend is invoked but we still need to make sure the PCI
device is enabled during resume. Simply using pci_enable_device()
unbalances device enable count. Export __pci_reenable_device().
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/pci/pci.c | 1 | ||||
-rw-r--r-- | drivers/pci/pci.h | 1 | ||||
-rw-r--r-- | include/linux/pci.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 03fd59e80fef..c95485398687 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1604,6 +1604,7 @@ early_param("pci", pci_setup); | |||
1604 | device_initcall(pci_init); | 1604 | device_initcall(pci_init); |
1605 | 1605 | ||
1606 | EXPORT_SYMBOL_GPL(pci_restore_bars); | 1606 | EXPORT_SYMBOL_GPL(pci_restore_bars); |
1607 | EXPORT_SYMBOL(__pci_reenable_device); | ||
1607 | EXPORT_SYMBOL(pci_enable_device_bars); | 1608 | EXPORT_SYMBOL(pci_enable_device_bars); |
1608 | EXPORT_SYMBOL(pci_enable_device); | 1609 | EXPORT_SYMBOL(pci_enable_device); |
1609 | EXPORT_SYMBOL(pcim_enable_device); | 1610 | EXPORT_SYMBOL(pcim_enable_device); |
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 3fec13d3add7..7b696cd66dc5 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -1,6 +1,5 @@ | |||
1 | /* Functions internal to the PCI core code */ | 1 | /* Functions internal to the PCI core code */ |
2 | 2 | ||
3 | extern int __must_check __pci_reenable_device(struct pci_dev *); | ||
4 | extern int pci_uevent(struct device *dev, char **envp, int num_envp, | 3 | extern int pci_uevent(struct device *dev, char **envp, int num_envp, |
5 | char *buffer, int buffer_size); | 4 | char *buffer, int buffer_size); |
6 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); | 5 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 5e84f2e8d54c..d8f8a3a96644 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -534,6 +534,7 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val | |||
534 | 534 | ||
535 | int __must_check pci_enable_device(struct pci_dev *dev); | 535 | int __must_check pci_enable_device(struct pci_dev *dev); |
536 | int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask); | 536 | int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask); |
537 | int __must_check __pci_reenable_device(struct pci_dev *); | ||
537 | int __must_check pcim_enable_device(struct pci_dev *pdev); | 538 | int __must_check pcim_enable_device(struct pci_dev *pdev); |
538 | void pcim_pin_device(struct pci_dev *pdev); | 539 | void pcim_pin_device(struct pci_dev *pdev); |
539 | 540 | ||