diff options
author | Linas Vepstas <linas@austin.ibm.com> | 2007-11-07 15:43:59 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 15:04:22 -0800 |
commit | 94688cf2454986309fbcd495233ba2423786a14a (patch) | |
tree | ac170991ef1db1127d59a0d7231a8cbb53b5474c /drivers/pci | |
parent | 1b7c9fcaa147662628078c83ecaf1ef2c5c9c9d0 (diff) | |
download | blackbird-op-linux-94688cf2454986309fbcd495233ba2423786a14a.tar.gz blackbird-op-linux-94688cf2454986309fbcd495233ba2423786a14a.zip |
PCI: export pci_restore_msi_state()
PCI error recovery usually involves the PCI adapter being reset.
If the device is using MSI, the reset will cause the MSI state
to be lost; the device driver needs to restore the MSI state.
The pci_restore_msi_state() routine is currently protected
by CONFIG_PM; remove this, and also export the symbol, so
that it can be used in a modle.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/msi.c | 3 | ||||
-rw-r--r-- | drivers/pci/pci.h | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 07c9f09c856d..30de51fcd68c 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -230,7 +230,6 @@ static void pci_intx_for_msi(struct pci_dev *dev, int enable) pci_intx(dev, enable); } -#ifdef CONFIG_PM static void __pci_restore_msi_state(struct pci_dev *dev) { int pos; @@ -288,7 +287,7 @@ void pci_restore_msi_state(struct pci_dev *dev) __pci_restore_msi_state(dev); __pci_restore_msix_state(dev); } -#endif /* CONFIG_PM */ +EXPORT_SYMBOL_GPL(pci_restore_msi_state); /** * msi_capability_init - configure device's MSI capability structure diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index fc87e14b50de..4c4613387786 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -45,12 +45,6 @@ static inline void pci_no_msi(void) { } static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } #endif -#if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM) -void pci_restore_msi_state(struct pci_dev *dev); -#else -static inline void pci_restore_msi_state(struct pci_dev *dev) {} -#endif - #ifdef CONFIG_PCIEAER void pci_no_aer(void); #else |