summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2006-12-18 10:27:45 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 15:50:03 -0800
commit924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23 (patch)
treea5088c74cafed4f7c3b2bff32c4912129ae5abd3 /drivers/pci
parent07eddf3d597f2d009a37a4e8c7c32a1ffe992f3e (diff)
downloadop-kernel-dev-924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23.zip
op-kernel-dev-924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23.tar.gz
PCI : remove too specialized __pci_enable_device for default resume
Original patch was posted as "PCI : Move pci_fixup_device and is_enabled". This 1 of 3 patches does: - reverts small part of Inaky's patch (remove __pci_enable_device) This change will be recovered by 3rd patch. - temporarily remove pci_fixup_device. This change will be recovered by 2nd patch. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-driver.c2
-rw-r--r--drivers/pci/pci.c23
-rw-r--r--drivers/pci/pci.h1
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);
OpenPOWER on IntegriCloud