Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8b553bf authored by Andi Kleen's avatar Andi Kleen Committed by Jesse Barnes
Browse files

PCI: disable pci_find_device warnings when deprecated pci functions are enabled 



Shut off the long standing

linux/drivers/pci/search.c:144: warning: 'pci_find_device' is deprecated (declared at linux/drivers/pci/search.c:136)
linux/drivers/pci/search.c:144: warning: 'pci_find_device' is deprecated (declared at linux/drivers/pci/search.c:136)

warnings that appear on every build when CONFIG_PCI_LEGACY is enabled.

gcc warns for the use in EXPORT_SYMBOL

I moved these to a separate file and disabled the warning in the Makefile for that file.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 6b5096e4

drivers/pci/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ 
obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_SYSFS) += slot.o



obj-$(CONFIG_PCI_LEGACY) += legacy.o

CFLAGS_legacy.o += -Wno-deprecated-declarations



# Build PCI Express stuff if needed

obj-$(CONFIG_PCIEPORTBUS) += pcie/

drivers/pci/legacy.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/pci.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include "pci.h"



/**

 * pci_find_device - begin or continue searching for a PCI device by vendor/device id

 * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids

 * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids

 * @from: Previous PCI device found in search, or %NULL for new search.

 *

 * Iterates through the list of known PCI devices.  If a PCI device is found

 * with a matching @vendor and @device, a pointer to its device structure is

 * returned.  Otherwise, %NULL is returned.

 * A new search is initiated by passing %NULL as the @from argument.

 * Otherwise if @from is not %NULL, searches continue from next device

 * on the global list.

 *

 * NOTE: Do not use this function any more; use pci_get_device() instead, as

 * the PCI device returned by this function can disappear at any moment in

 * time.

 */

struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,

				struct pci_dev *from)

{

	struct pci_dev *pdev;



	pci_dev_get(from);

	pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);

	pci_dev_put(pdev);

	return pdev;

}

EXPORT_SYMBOL(pci_find_device);

drivers/pci/search.c

+0 −31
Original line number Diff line number Diff line
@@ -113,37 +113,6 @@ pci_find_next_bus(const struct pci_bus *from) 
	return b;

}



#ifdef CONFIG_PCI_LEGACY

/**

 * pci_find_device - begin or continue searching for a PCI device by vendor/device id

 * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids

 * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids

 * @from: Previous PCI device found in search, or %NULL for new search.

 *

 * Iterates through the list of known PCI devices.  If a PCI device is found

 * with a matching @vendor and @device, a pointer to its device structure is

 * returned.  Otherwise, %NULL is returned.

 * A new search is initiated by passing %NULL as the @from argument.

 * Otherwise if @from is not %NULL, searches continue from next device

 * on the global list.

 *

 * NOTE: Do not use this function any more; use pci_get_device() instead, as

 * the PCI device returned by this function can disappear at any moment in

 * time.

 */

struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,

				struct pci_dev *from)

{

	struct pci_dev *pdev;



	pci_dev_get(from);

	pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);

	pci_dev_put(pdev);

	return pdev;

}

EXPORT_SYMBOL(pci_find_device);

#endif /* CONFIG_PCI_LEGACY */



/**

 * pci_get_slot - locate PCI device for a given PCI slot

 * @bus: PCI bus on which desired PCI device resides