summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-12-20 15:28:10 +1100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 15:04:28 -0800
commit7cbe5b6005f80de33a205d3052cdc89aacaac07c (patch)
tree85437dbcfe2c994a76b51bec959f2e978a6e7895
parent0948391641918b95d8d96c15089eb5ac156850b3 (diff)
downloadblackbird-op-linux-7cbe5b6005f80de33a205d3052cdc89aacaac07c.tar.gz
blackbird-op-linux-7cbe5b6005f80de33a205d3052cdc89aacaac07c.zip
PCI: Remove pci_enable_device_bars()
Now that all in-tree users are gone, this removes pci_enable_device_bars() completely. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pci/pci.c24
-rw-r--r--include/linux/pci.h1
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5027e4d08b48..35f78f1628fc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -741,29 +741,6 @@ int pci_reenable_device(struct pci_dev *dev)
return 0;
}
-/**
- * pci_enable_device_bars - Initialize some of a device for use
- * @dev: PCI device to be initialized
- * @bars: bitmask of BAR's that must be configured
- *
- * Initialize device before it's used by a driver. Ask low-level code
- * to enable selected I/O and memory resources. Wake up the device if it
- * was suspended. Beware, this function can fail.
- */
-int
-pci_enable_device_bars(struct pci_dev *dev, int bars)
-{
- int err;
-
- if (atomic_add_return(1, &dev->enable_cnt) > 1)
- return 0; /* already enabled */
-
- err = do_pci_enable_device(dev, bars);
- if (err < 0)
- atomic_dec(&dev->enable_cnt);
- return err;
-}
-
static int __pci_enable_device_flags(struct pci_dev *dev,
resource_size_t flags)
{
@@ -1695,7 +1672,6 @@ early_param("pci", pci_setup);
device_initcall(pci_init);
EXPORT_SYMBOL(pci_reenable_device);
-EXPORT_SYMBOL(pci_enable_device_bars);
EXPORT_SYMBOL(pci_enable_device_io);
EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e4c1dacb6636..13813b0592fc 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -543,7 +543,6 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
}
int __must_check pci_enable_device(struct pci_dev *dev);
-int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
int __must_check pci_enable_device_io(struct pci_dev *dev);
int __must_check pci_enable_device_mem(struct pci_dev *dev);
int __must_check pci_reenable_device(struct pci_dev *);
OpenPOWER on IntegriCloud