diff options
author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2006-12-17 20:27:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:50:03 -0500 |
commit | 924b08f3ff12eb0e8ecd9e9a9b6a5b884a495c23 (patch) | |
tree | a5088c74cafed4f7c3b2bff32c4912129ae5abd3 /drivers/pci/pci.c | |
parent | 07eddf3d597f2d009a37a4e8c7c32a1ffe992f3e (diff) |
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/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 206c834d263a..d20d3983bbd6 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) | |||
701 | } | 701 | } |
702 | 702 | ||
703 | /** | 703 | /** |
704 | * __pci_enable_device - Initialize device before it's used by a driver. | ||
705 | * @dev: PCI device to be initialized | ||
706 | * | ||
707 | * Initialize device before it's used by a driver. Ask low-level code | ||
708 | * to enable I/O and memory. Wake up the device if it was suspended. | ||
709 | * Beware, this function can fail. | ||
710 | * | ||
711 | * Note this function is a backend and is not supposed to be called by | ||
712 | * normal code, use pci_enable_device() instead. | ||
713 | */ | ||
714 | int | ||
715 | __pci_enable_device(struct pci_dev *dev) | ||
716 | { | ||
717 | int err; | ||
718 | |||
719 | err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); | ||
720 | if (err) | ||
721 | return err; | ||
722 | pci_fixup_device(pci_fixup_enable, dev); | ||
723 | return 0; | ||
724 | } | ||
725 | |||
726 | /** | ||
727 | * pci_enable_device - Initialize device before it's used by a driver. | 704 | * pci_enable_device - Initialize device before it's used by a driver. |
728 | * @dev: PCI device to be initialized | 705 | * @dev: PCI device to be initialized |
729 | * | 706 | * |