ice: Change device ID define names to align with branding string

Basically remove references to C810 and use E810C (from the branding
string) instead.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
index a6f0a5c0c3057fb08b068b69e5f8ba883e2473cc..f8d5c661d0baf8c115884a5b1e32178a72a21f66 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@ -6,10 +6,10 @@
 
 /* Device IDs */
 /* Intel(R) Ethernet Controller E810-C for backplane */
-#define ICE_DEV_ID_C810_BACKPLANE      0x1591
+#define ICE_DEV_ID_E810C_BACKPLANE     0x1591
 /* Intel(R) Ethernet Controller E810-C for QSFP */
-#define ICE_DEV_ID_C810_QSFP           0x1592
+#define ICE_DEV_ID_E810C_QSFP          0x1592
 /* Intel(R) Ethernet Controller E810-C for SFP */
-#define ICE_DEV_ID_C810_SFP            0x1593
+#define ICE_DEV_ID_E810C_SFP           0x1593
 
 #endif /* _ICE_DEVIDS_H_ */

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 8f61b375e7687d10be07ff84b7b3f5cea25d51c2..0084b7290b2b4e96371945c4959a14a5b020ffb5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2271,9 +2271,9 @@ static void ice_remove(struct pci_dev *pdev)
  *   Class, Class Mask, private data (not used) }
  */
 static const struct pci_device_id ice_pci_tbl[] = {
-       { PCI_VDEVICE(INTEL, ICE_DEV_ID_C810_BACKPLANE), 0 },
-       { PCI_VDEVICE(INTEL, ICE_DEV_ID_C810_QSFP), 0 },
-       { PCI_VDEVICE(INTEL, ICE_DEV_ID_C810_SFP), 0 },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_BACKPLANE), 0 },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 },
+       { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 },
        /* required last entry */
        { 0, }
 };