Re: [PATCH] PCI fixes for 2.6.9

From: Greg KH
Date: Wed Oct 20 2004 - 01:47:51 EST


ChangeSet 1.1997.37.3, 2004/10/06 11:18:21-07:00, greg@xxxxxxxxx

[PATCH] PCI: make pci_find_subsys() static, as it should not be used anymore

Use pci_get_subsys() if you want this functionality.

Signed-off-by: Greg Kroah-Hartman <greg@xxxxxxxxx>


drivers/pci/search.c | 10 +++++-----
include/linux/pci.h | 7 -------
2 files changed, 5 insertions(+), 12 deletions(-)


diff -Nru a/drivers/pci/search.c b/drivers/pci/search.c
--- a/drivers/pci/search.c 2004-10-19 15:27:42 -07:00
+++ b/drivers/pci/search.c 2004-10-19 15:27:42 -07:00
@@ -156,10 +156,11 @@
* the pci device returned by this function can disappear at any moment in
* time.
*/
-struct pci_dev *
-pci_find_subsys(unsigned int vendor, unsigned int device,
- unsigned int ss_vendor, unsigned int ss_device,
- const struct pci_dev *from)
+static struct pci_dev * pci_find_subsys(unsigned int vendor,
+ unsigned int device,
+ unsigned int ss_vendor,
+ unsigned int ss_device,
+ const struct pci_dev *from)
{
struct list_head *n;
struct pci_dev *dev;
@@ -351,7 +352,6 @@
EXPORT_SYMBOL(pci_find_device);
EXPORT_SYMBOL(pci_find_device_reverse);
EXPORT_SYMBOL(pci_find_slot);
-EXPORT_SYMBOL(pci_find_subsys);
EXPORT_SYMBOL(pci_get_device);
EXPORT_SYMBOL(pci_get_subsys);
EXPORT_SYMBOL(pci_get_slot);
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h 2004-10-19 15:27:42 -07:00
+++ b/include/linux/pci.h 2004-10-19 15:27:42 -07:00
@@ -719,9 +719,6 @@

struct pci_dev *pci_find_device (unsigned int vendor, unsigned int device, const struct pci_dev *from);
struct pci_dev *pci_find_device_reverse (unsigned int vendor, unsigned int device, const struct pci_dev *from);
-struct pci_dev *pci_find_subsys (unsigned int vendor, unsigned int device,
- unsigned int ss_vendor, unsigned int ss_device,
- const struct pci_dev *from);
struct pci_dev *pci_find_class (unsigned int class, const struct pci_dev *from);
struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn);
int pci_find_capability (struct pci_dev *dev, int cap);
@@ -886,10 +883,6 @@
{ return NULL; }

static inline struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn)
-{ return NULL; }
-
-static inline struct pci_dev *pci_find_subsys(unsigned int vendor, unsigned int device,
-unsigned int ss_vendor, unsigned int ss_device, const struct pci_dev *from)
{ return NULL; }

static inline struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/