From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 9 Feb 2014 23:34:11 +0000 (+0000)
Subject: pci: Add PCI_DEVICE_SUB() macro
X-Git-Tag: v3.2.55~16
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ef0d53ff3d8cf6630d38f61f1a071740714be7af

pci: Add PCI_DEVICE_SUB() macro

This was added as part of commit 3d567e0e291c ('tg3: Set 10_100_ONLY
flag for additional 10/100 Mbps devices') upstream and is needed by
the following patch to ahci.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7cda65b5f798..fe76a74ae0b3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -589,6 +589,20 @@ struct pci_driver {
 	.vendor = (vend), .device = (dev), \
 	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 
+/**
+ * PCI_DEVICE_SUB - macro used to describe a specific pci device with subsystem
+ * @vend: the 16 bit PCI Vendor ID
+ * @dev: the 16 bit PCI Device ID
+ * @subvend: the 16 bit PCI Subvendor ID
+ * @subdev: the 16 bit PCI Subdevice ID
+ *
+ * This macro is used to create a struct pci_device_id that matches a
+ * specific device with subsystem information.
+ */
+#define PCI_DEVICE_SUB(vend, dev, subvend, subdev) \
+	.vendor = (vend), .device = (dev), \
+	.subvendor = (subvend), .subdevice = (subdev)
+
 /**
  * PCI_DEVICE_CLASS - macro used to describe a specific pci device class
  * @dev_class: the class, subclass, prog-if triple for this device