From fbca9307dfce20491b85bcad31e1252765d7e58c Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Mon, 18 Dec 2006 10:27:45 +0900
Subject: [PATCH] --- yaml --- r: 46703 b: refs/heads/master c:
 924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23 h: refs/heads/master i:   46701:
 dfb5564e460d9bb6068c7cb41c48d59d77acaf50   46699:
 ac392f70ccc1d3f7fb12692a12e70aab872a2911   46695:
 4044a9aed2f8bc51114ec9dd051c02acf4b16860   46687:
 d85c5948c0d7ec64ed656ff034e081966e32b628 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/pci/pci-driver.c |  2 +-
 trunk/drivers/pci/pci.c        | 23 -----------------------
 trunk/drivers/pci/pci.h        |  1 -
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index a6cbf12ba960..f34e9d1e855f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07eddf3d597f2d009a37a4e8c7c32a1ffe992f3e
+refs/heads/master: 924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23
diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c
index 92d5e8db0de7..1ec546d3d53c 100644
--- a/trunk/drivers/pci/pci-driver.c
+++ b/trunk/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/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 206c834d263a..d20d3983bbd6 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -700,29 +700,6 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
 	return 0;
 }
 
-/**
- * __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/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index 398852f526a6..6bf327db5c5e 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/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);