Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI: Clean-up MPS debug output
  pci: Clamp pcie_set_readrq() when using "performance" settings
  PCI: enable MPS "performance" setting to properly handle bridge MPS
  PCI: Workaround for Intel MPS errata
  PCI: Add support for PASID capability
  PCI: Add implementation for PRI capability
  PCI: Export ATS functions to modules
  PCI: Move ATS implementation into own file
  PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
  PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
  PCI / PM: Extend PME polling to all PCI devices
  PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
  PCI: Make pci_setup_bridge() non-static for use by arch code
  x86: constify PCI raw ops structures
  PCI: Add quirk for known incorrect MPSS
  PCI: Add Solarflare vendor ID and SFC4000 device IDs

4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index de9afebe1830..d5731f1fe6d6 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2229,13 +2229,15 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
 
 /* PCI device ID table */
 static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
-        {PCI_DEVICE(EFX_VENDID_SFC, FALCON_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                    PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0),
          .driver_data = (unsigned long) &falcon_a1_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, FALCON_B_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),
          .driver_data = (unsigned long) &falcon_b0_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, BETHPAGE_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),
          .driver_data = (unsigned long) &siena_a0_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, SIENA_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),
          .driver_data = (unsigned long) &siena_a0_nic_type},
         {0}                     /* end of list */
 };
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 442f4d0c247d..4764793ed234 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -15,10 +15,6 @@
 #include "filter.h"
 
 /* PCI IDs */
-#define EFX_VENDID_SFC          0x1924
-#define FALCON_A_P_DEVID        0x0703
-#define FALCON_A_S_DEVID        0x6703
-#define FALCON_B_P_DEVID        0x0710
 #define BETHPAGE_A_P_DEVID      0x0803
 #define SIENA_A_P_DEVID         0x0813
 
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 4dd1748a19c6..97b606b92e88 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -1426,7 +1426,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
                 }
 
                 dev = pci_dev_get(efx->pci_dev);
-                while ((dev = pci_get_device(EFX_VENDID_SFC, FALCON_A_S_DEVID,
+                while ((dev = pci_get_device(PCI_VENDOR_ID_SOLARFLARE,
+                                             PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1,
                                              dev))) {
                         if (dev->bus == efx->pci_dev->bus &&
                             dev->devfn == efx->pci_dev->devfn + 1) {
diff --git a/drivers/net/ethernet/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c
index b9cc846811d6..6cc16b8cc6f4 100644
--- a/drivers/net/ethernet/sfc/falcon_boards.c
+++ b/drivers/net/ethernet/sfc/falcon_boards.c
@@ -764,7 +764,8 @@ int falcon_probe_board(struct efx_nic *efx, u16 revision_info)
 
         if (board->type) {
                 netif_info(efx, probe, efx->net_dev, "board is %s rev %c%d\n",
-                         (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC)
+                         (efx->pci_dev->subsystem_vendor ==
+                          PCI_VENDOR_ID_SOLARFLARE)
                          ? board->type->ref_model : board->type->gen_type,
                          'A' + board->major, board->minor);
                 return 0;