diff options
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 23 | ||||
| -rw-r--r-- | drivers/pci/pci.h | 1 |
3 files changed, 1 insertions, 25 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 92d5e8d..1ec546d 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -325,7 +325,7 @@ static int pci_default_resume(struct pci_dev *pci_dev) pci_restore_state(pci_dev); /* if the device was enabled before suspend, reenable */ if (atomic_read(&pci_dev->enable_cnt)) - retval = __pci_enable_device(pci_dev); + retval = pci_enable_device(pci_dev); /* if the device was busmaster before the suspend, make it busmaster again */ if (pci_dev->is_busmaster) pci_set_master(pci_dev); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 206c834..d20d398 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -701,29 +701,6 @@ pci_enable_device_bars(struct pci_dev *dev, int bars) } /** - * __pci_enable_device - Initialize device before it's used by a driver. - * @dev: PCI device to be initialized - * - * Initialize device before it's used by a driver. Ask low-level code - * to enable I/O and memory. Wake up the device if it was suspended. - * Beware, this function can fail. - * - * Note this function is a backend and is not supposed to be called by - * normal code, use pci_enable_device() instead. - */ -int -__pci_enable_device(struct pci_dev *dev) -{ - int err; - - err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); - if (err) - return err; - pci_fixup_device(pci_fixup_enable, dev); - return 0; -} - -/** * pci_enable_device - Initialize device before it's used by a driver. * @dev: PCI device to be initialized * diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 398852f..6bf327d 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -1,6 +1,5 @@ /* Functions internal to the PCI core code */ -extern int __must_check __pci_enable_device(struct pci_dev *); extern int pci_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size); extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); |
