From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: linux-pci@atrey.karlin.mff.cuni.cz,
<linux-kernel@vger.kernel.org>, <ink@jurassic.park.msu.ru>,
Alan Cox <alan@redhat.com>, <james.smart@emulex.com>,
<linux-driver@qlogic.com>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH 3/3] pci: Remove pci_enable_device_bars()
Date: Thu, 20 Dec 2007 15:28:10 +1100 [thread overview]
Message-ID: <20071220042812.706D0DDEE7@ozlabs.org> (raw)
Now that all in-tree users are gone, this removes pci_enable_device_bars()
completely.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/pci/pci.c | 24 ------------------------
include/linux/pci.h | 1 -
2 files changed, 25 deletions(-)
--- linux-work.orig/drivers/pci/pci.c 2007-12-18 11:01:20.000000000 +1100
+++ linux-work/drivers/pci/pci.c 2007-12-18 11:01:28.000000000 +1100
@@ -713,29 +713,6 @@ int pci_reenable_device(struct pci_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)
{
@@ -1665,7 +1642,6 @@ device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars);
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);
Index: linux-work/include/linux/pci.h
===================================================================
--- linux-work.orig/include/linux/pci.h 2007-12-18 11:00:33.000000000 +1100
+++ linux-work/include/linux/pci.h 2007-12-18 11:01:28.000000000 +1100
@@ -547,7 +547,6 @@ static inline int pci_write_config_dword
}
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 *);
next reply other threads:[~2007-12-20 4:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-20 4:28 Benjamin Herrenschmidt [this message]
2007-12-21 2:59 ` patch pci-remove-pci_enable_device_bars.patch added to gregkh-2.6 tree gregkh
2007-12-21 4:28 ` [PATCH 3/3] pci: Remove pci_enable_device_bars() Greg KH
2007-12-21 4:44 ` Benjamin Herrenschmidt
2007-12-21 4:47 ` Benjamin Herrenschmidt
2007-12-21 5:11 ` Greg KH
2007-12-21 5:32 ` Benjamin Herrenschmidt
2007-12-21 17:40 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071220042812.706D0DDEE7@ozlabs.org \
--to=benh@kernel.crashing.org \
--cc=alan@redhat.com \
--cc=bzolnier@gmail.com \
--cc=greg@kroah.com \
--cc=ink@jurassic.park.msu.ru \
--cc=james.smart@emulex.com \
--cc=linux-driver@qlogic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox