pci: Move PCI_VDEVICE from libata to core
PATCH 1/1 pci: Move PCI_VDEVICE from libata to core
Updated diff which doesn't move the comment as per Jeff's request and corrects the docs as per report on l/k
Signed-off-by Alan Cox <[email protected]>
include/linux/libata.h +0 -4
@@ -110,10 +110,6 @@#define ATA_TAG_POISON 0xfafbfcfdU/* move to PCI layer? */ -#define PCI_VDEVICE (vendor, device) \ - PCI_VENDOR_ID_##vendor, (device), \ - PCI_ANY_ID, PCI_ANY_ID, 0, 0 -static inline struct device *pci_dev_to_dev (struct pci_dev *pdev) {return &pdev->dev;
include/linux/pci.h +15 -0
@@ -389,6 +389,21 @@ .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID +/** +* PCI_VDEVICE - macro used to describe a specific pci device in short form +* @vendor: the vendor name +* @device: the 16 bit PCI Device ID +* +* This macro is used to create a struct pci_device_id that matches a +* specific PCI device. The subvendor, and subdevice fields will be set +* to PCI_ANY_ID. The macro allows the next field to follow as the device +* private data. + */ + +#define PCI_VDEVICE (vendor, device) \ + PCI_VENDOR_ID_##vendor, (device), \ + PCI_ANY_ID, PCI_ANY_ID, 0, 0 +/* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI