From ea92b700df602be2ce08dd42052ff38f36148948 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 4 Jun 2013 18:41:53 -0700 Subject: [PATCH] intel: Remove 'misc' parameter from CHIPSET macro in PCI ID tables. This has never actually been used for anything. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- include/pci_ids/i915_pci_ids.h | 30 ++--- include/pci_ids/i965_pci_ids.h | 186 ++++++++++++++-------------- include/pci_ids/pci_id_driver_map.h | 4 +- 3 files changed, 110 insertions(+), 110 deletions(-) diff --git a/include/pci_ids/i915_pci_ids.h b/include/pci_ids/i915_pci_ids.h index 551c010a9a7..964b1cb4ff0 100644 --- a/include/pci_ids/i915_pci_ids.h +++ b/include/pci_ids/i915_pci_ids.h @@ -1,15 +1,15 @@ -CHIPSET(0x3577, I830_M, i8xx) -CHIPSET(0x2562, 845_G, i8xx) -CHIPSET(0x3582, I855_GM, i8xx) -CHIPSET(0x2572, I865_G, i8xx) -CHIPSET(0x2582, I915_G, i915) -CHIPSET(0x258A, E7221_G, i915) -CHIPSET(0x2592, I915_GM, i915) -CHIPSET(0x2772, I945_G, i945) -CHIPSET(0x27A2, I945_GM, i945) -CHIPSET(0x27AE, I945_GME, i945) -CHIPSET(0x29B2, Q35_G, i945) -CHIPSET(0x29C2, G33_G, i945) -CHIPSET(0x29D2, Q33_G, i945) -CHIPSET(0xA011, IGD_GM, i945) -CHIPSET(0xA001, IGD_G, i945) +CHIPSET(0x3577, I830_M) +CHIPSET(0x2562, 845_G) +CHIPSET(0x3582, I855_GM) +CHIPSET(0x2572, I865_G) +CHIPSET(0x2582, I915_G) +CHIPSET(0x258A, E7221_G) +CHIPSET(0x2592, I915_GM) +CHIPSET(0x2772, I945_G) +CHIPSET(0x27A2, I945_GM) +CHIPSET(0x27AE, I945_GME) +CHIPSET(0x29B2, Q35_G) +CHIPSET(0x29C2, G33_G) +CHIPSET(0x29D2, Q33_G) +CHIPSET(0xA011, IGD_GM) +CHIPSET(0xA001, IGD_G) diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h index 808eb4e2d4e..fb171daad26 100644 --- a/include/pci_ids/i965_pci_ids.h +++ b/include/pci_ids/i965_pci_ids.h @@ -1,93 +1,93 @@ -CHIPSET(0x29A2, I965_G, i965) -CHIPSET(0x2992, I965_Q, i965) -CHIPSET(0x2982, I965_G_1, i965) -CHIPSET(0x2972, I946_GZ, i965) -CHIPSET(0x2A02, I965_GM, i965) -CHIPSET(0x2A12, I965_GME, i965) -CHIPSET(0x2A42, GM45_GM, g4x) -CHIPSET(0x2E02, IGD_E_G, g4x) -CHIPSET(0x2E12, Q45_G, g4x) -CHIPSET(0x2E22, G45_G, g4x) -CHIPSET(0x2E32, G41_G, g4x) -CHIPSET(0x2E42, B43_G, g4x) -CHIPSET(0x2E92, B43_G1, g4x) -CHIPSET(0x0042, ILD_G, ilk) -CHIPSET(0x0046, ILM_G, ilk) -CHIPSET(0x0102, SANDYBRIDGE_GT1, snb_gt1) -CHIPSET(0x0112, SANDYBRIDGE_GT2, snb_gt2) -CHIPSET(0x0122, SANDYBRIDGE_GT2_PLUS, snb_gt2) -CHIPSET(0x0106, SANDYBRIDGE_M_GT1, snb_gt1) -CHIPSET(0x0116, SANDYBRIDGE_M_GT2, snb_gt2) -CHIPSET(0x0126, SANDYBRIDGE_M_GT2_PLUS, snb_gt2) -CHIPSET(0x010A, SANDYBRIDGE_S, snb_gt1) -CHIPSET(0x0152, IVYBRIDGE_GT1, ivb_gt1) -CHIPSET(0x0162, IVYBRIDGE_GT2, ivb_gt2) -CHIPSET(0x0156, IVYBRIDGE_M_GT1, ivb_gt1) -CHIPSET(0x0166, IVYBRIDGE_M_GT2, ivb_gt2) -CHIPSET(0x015a, IVYBRIDGE_S_GT1, ivb_gt1) -CHIPSET(0x016a, IVYBRIDGE_S_GT2, ivb_gt2) -CHIPSET(0x0402, HASWELL_GT1, hsw_gt1) -CHIPSET(0x0412, HASWELL_GT2, hsw_gt2) -CHIPSET(0x0422, HASWELL_GT3, hsw_gt3) -CHIPSET(0x0406, HASWELL_M_GT1, hsw_gt1) -CHIPSET(0x0416, HASWELL_M_GT2, hsw_gt2) -CHIPSET(0x0426, HASWELL_M_GT3, hsw_gt3) -CHIPSET(0x040A, HASWELL_S_GT1, hsw_gt1) -CHIPSET(0x041A, HASWELL_S_GT2, hsw_gt2) -CHIPSET(0x042A, HASWELL_S_GT3, hsw_gt3) -CHIPSET(0x040B, HASWELL_B_GT1, hsw_gt1) -CHIPSET(0x041B, HASWELL_B_GT2, hsw_gt2) -CHIPSET(0x042B, HASWELL_B_GT3, hsw_gt3) -CHIPSET(0x040E, HASWELL_E_GT1, hsw_gt1) -CHIPSET(0x041E, HASWELL_E_GT2, hsw_gt2) -CHIPSET(0x042E, HASWELL_E_GT3, hsw_gt3) -CHIPSET(0x0C02, HASWELL_SDV_GT1, hsw_gt1) -CHIPSET(0x0C12, HASWELL_SDV_GT2, hsw_gt2) -CHIPSET(0x0C22, HASWELL_SDV_GT3, hsw_gt3) -CHIPSET(0x0C06, HASWELL_SDV_M_GT1, hsw_gt1) -CHIPSET(0x0C16, HASWELL_SDV_M_GT2, hsw_gt2) -CHIPSET(0x0C26, HASWELL_SDV_M_GT3, hsw_gt3) -CHIPSET(0x0C0A, HASWELL_SDV_S_GT1, hsw_gt1) -CHIPSET(0x0C1A, HASWELL_SDV_S_GT2, hsw_gt2) -CHIPSET(0x0C2A, HASWELL_SDV_S_GT3, hsw_gt3) -CHIPSET(0x0C0B, HASWELL_SDV_B_GT1, hsw_gt1) -CHIPSET(0x0C1B, HASWELL_SDV_B_GT2, hsw_gt2) -CHIPSET(0x0C2B, HASWELL_SDV_B_GT3, hsw_gt3) -CHIPSET(0x0C0E, HASWELL_SDV_E_GT1, hsw_gt1) -CHIPSET(0x0C1E, HASWELL_SDV_E_GT2, hsw_gt2) -CHIPSET(0x0C2E, HASWELL_SDV_E_GT3, hsw_gt3) -CHIPSET(0x0A02, HASWELL_ULT_GT1, hsw_gt1) -CHIPSET(0x0A12, HASWELL_ULT_GT2, hsw_gt2) -CHIPSET(0x0A22, HASWELL_ULT_GT3, hsw_gt3) -CHIPSET(0x0A06, HASWELL_ULT_M_GT1, hsw_gt1) -CHIPSET(0x0A16, HASWELL_ULT_M_GT2, hsw_gt2) -CHIPSET(0x0A26, HASWELL_ULT_M_GT3, hsw_gt3) -CHIPSET(0x0A0A, HASWELL_ULT_S_GT1, hsw_gt1) -CHIPSET(0x0A1A, HASWELL_ULT_S_GT2, hsw_gt2) -CHIPSET(0x0A2A, HASWELL_ULT_S_GT3, hsw_gt3) -CHIPSET(0x0A0B, HASWELL_ULT_B_GT1, hsw_gt1) -CHIPSET(0x0A1B, HASWELL_ULT_B_GT2, hsw_gt2) -CHIPSET(0x0A2B, HASWELL_ULT_B_GT3, hsw_gt3) -CHIPSET(0x0A0E, HASWELL_ULT_E_GT1, hsw_gt1) -CHIPSET(0x0A1E, HASWELL_ULT_E_GT2, hsw_gt2) -CHIPSET(0x0A2E, HASWELL_ULT_E_GT3, hsw_gt3) -CHIPSET(0x0D02, HASWELL_CRW_GT1, hsw_gt1) -CHIPSET(0x0D12, HASWELL_CRW_GT2, hsw_gt2) -CHIPSET(0x0D22, HASWELL_CRW_GT3, hsw_gt3) -CHIPSET(0x0D06, HASWELL_CRW_M_GT1, hsw_gt1) -CHIPSET(0x0D16, HASWELL_CRW_M_GT2, hsw_gt2) -CHIPSET(0x0D26, HASWELL_CRW_M_GT3, hsw_gt3) -CHIPSET(0x0D0A, HASWELL_CRW_S_GT1, hsw_gt1) -CHIPSET(0x0D1A, HASWELL_CRW_S_GT2, hsw_gt2) -CHIPSET(0x0D2A, HASWELL_CRW_S_GT3, hsw_gt3) -CHIPSET(0x0D0B, HASWELL_CRW_B_GT1, hsw_gt1) -CHIPSET(0x0D1B, HASWELL_CRW_B_GT2, hsw_gt2) -CHIPSET(0x0D2B, HASWELL_CRW_B_GT3, hsw_gt3) -CHIPSET(0x0D0E, HASWELL_CRW_E_GT1, hsw_gt1) -CHIPSET(0x0D1E, HASWELL_CRW_E_GT2, hsw_gt2) -CHIPSET(0x0D2E, HASWELL_CRW_E_GT3, hsw_gt3) -CHIPSET(0x0F31, BAYTRAIL_M_1, byt) -CHIPSET(0x0F32, BAYTRAIL_M_2, byt) -CHIPSET(0x0F33, BAYTRAIL_M_3, byt) -CHIPSET(0x0157, BAYTRAIL_M_4, byt) -CHIPSET(0x0155, BAYTRAIL_D, byt) +CHIPSET(0x29A2, I965_G) +CHIPSET(0x2992, I965_Q) +CHIPSET(0x2982, I965_G_1) +CHIPSET(0x2972, I946_GZ) +CHIPSET(0x2A02, I965_GM) +CHIPSET(0x2A12, I965_GME) +CHIPSET(0x2A42, GM45_GM) +CHIPSET(0x2E02, IGD_E_G) +CHIPSET(0x2E12, Q45_G) +CHIPSET(0x2E22, G45_G) +CHIPSET(0x2E32, G41_G) +CHIPSET(0x2E42, B43_G) +CHIPSET(0x2E92, B43_G1) +CHIPSET(0x0042, ILD_G) +CHIPSET(0x0046, ILM_G) +CHIPSET(0x0102, SANDYBRIDGE_GT1) +CHIPSET(0x0112, SANDYBRIDGE_GT2) +CHIPSET(0x0122, SANDYBRIDGE_GT2_PLUS) +CHIPSET(0x0106, SANDYBRIDGE_M_GT1) +CHIPSET(0x0116, SANDYBRIDGE_M_GT2) +CHIPSET(0x0126, SANDYBRIDGE_M_GT2_PLUS) +CHIPSET(0x010A, SANDYBRIDGE_S) +CHIPSET(0x0152, IVYBRIDGE_GT1) +CHIPSET(0x0162, IVYBRIDGE_GT2) +CHIPSET(0x0156, IVYBRIDGE_M_GT1) +CHIPSET(0x0166, IVYBRIDGE_M_GT2) +CHIPSET(0x015a, IVYBRIDGE_S_GT1) +CHIPSET(0x016a, IVYBRIDGE_S_GT2) +CHIPSET(0x0402, HASWELL_GT1) +CHIPSET(0x0412, HASWELL_GT2) +CHIPSET(0x0422, HASWELL_GT3) +CHIPSET(0x0406, HASWELL_M_GT1) +CHIPSET(0x0416, HASWELL_M_GT2) +CHIPSET(0x0426, HASWELL_M_GT3) +CHIPSET(0x040A, HASWELL_S_GT1) +CHIPSET(0x041A, HASWELL_S_GT2) +CHIPSET(0x042A, HASWELL_S_GT3) +CHIPSET(0x040B, HASWELL_B_GT1) +CHIPSET(0x041B, HASWELL_B_GT2) +CHIPSET(0x042B, HASWELL_B_GT3) +CHIPSET(0x040E, HASWELL_E_GT1) +CHIPSET(0x041E, HASWELL_E_GT2) +CHIPSET(0x042E, HASWELL_E_GT3) +CHIPSET(0x0C02, HASWELL_SDV_GT1) +CHIPSET(0x0C12, HASWELL_SDV_GT2) +CHIPSET(0x0C22, HASWELL_SDV_GT3) +CHIPSET(0x0C06, HASWELL_SDV_M_GT1) +CHIPSET(0x0C16, HASWELL_SDV_M_GT2) +CHIPSET(0x0C26, HASWELL_SDV_M_GT3) +CHIPSET(0x0C0A, HASWELL_SDV_S_GT1) +CHIPSET(0x0C1A, HASWELL_SDV_S_GT2) +CHIPSET(0x0C2A, HASWELL_SDV_S_GT3) +CHIPSET(0x0C0B, HASWELL_SDV_B_GT1) +CHIPSET(0x0C1B, HASWELL_SDV_B_GT2) +CHIPSET(0x0C2B, HASWELL_SDV_B_GT3) +CHIPSET(0x0C0E, HASWELL_SDV_E_GT1) +CHIPSET(0x0C1E, HASWELL_SDV_E_GT2) +CHIPSET(0x0C2E, HASWELL_SDV_E_GT3) +CHIPSET(0x0A02, HASWELL_ULT_GT1) +CHIPSET(0x0A12, HASWELL_ULT_GT2) +CHIPSET(0x0A22, HASWELL_ULT_GT3) +CHIPSET(0x0A06, HASWELL_ULT_M_GT1) +CHIPSET(0x0A16, HASWELL_ULT_M_GT2) +CHIPSET(0x0A26, HASWELL_ULT_M_GT3) +CHIPSET(0x0A0A, HASWELL_ULT_S_GT1) +CHIPSET(0x0A1A, HASWELL_ULT_S_GT2) +CHIPSET(0x0A2A, HASWELL_ULT_S_GT3) +CHIPSET(0x0A0B, HASWELL_ULT_B_GT1) +CHIPSET(0x0A1B, HASWELL_ULT_B_GT2) +CHIPSET(0x0A2B, HASWELL_ULT_B_GT3) +CHIPSET(0x0A0E, HASWELL_ULT_E_GT1) +CHIPSET(0x0A1E, HASWELL_ULT_E_GT2) +CHIPSET(0x0A2E, HASWELL_ULT_E_GT3) +CHIPSET(0x0D02, HASWELL_CRW_GT1) +CHIPSET(0x0D12, HASWELL_CRW_GT2) +CHIPSET(0x0D22, HASWELL_CRW_GT3) +CHIPSET(0x0D06, HASWELL_CRW_M_GT1) +CHIPSET(0x0D16, HASWELL_CRW_M_GT2) +CHIPSET(0x0D26, HASWELL_CRW_M_GT3) +CHIPSET(0x0D0A, HASWELL_CRW_S_GT1) +CHIPSET(0x0D1A, HASWELL_CRW_S_GT2) +CHIPSET(0x0D2A, HASWELL_CRW_S_GT3) +CHIPSET(0x0D0B, HASWELL_CRW_B_GT1) +CHIPSET(0x0D1B, HASWELL_CRW_B_GT2) +CHIPSET(0x0D2B, HASWELL_CRW_B_GT3) +CHIPSET(0x0D0E, HASWELL_CRW_E_GT1) +CHIPSET(0x0D1E, HASWELL_CRW_E_GT2) +CHIPSET(0x0D2E, HASWELL_CRW_E_GT3) +CHIPSET(0x0F31, BAYTRAIL_M_1) +CHIPSET(0x0F32, BAYTRAIL_M_2) +CHIPSET(0x0F33, BAYTRAIL_M_3) +CHIPSET(0x0157, BAYTRAIL_M_4) +CHIPSET(0x0155, BAYTRAIL_D) diff --git a/include/pci_ids/pci_id_driver_map.h b/include/pci_ids/pci_id_driver_map.h index fce38af0fe0..41bb628f4c6 100644 --- a/include/pci_ids/pci_id_driver_map.h +++ b/include/pci_ids/pci_id_driver_map.h @@ -8,13 +8,13 @@ #endif static const int i915_chip_ids[] = { -#define CHIPSET(chip, desc, misc) chip, +#define CHIPSET(chip, desc) chip, #include "pci_ids/i915_pci_ids.h" #undef CHIPSET }; static const int i965_chip_ids[] = { -#define CHIPSET(chip, desc, misc) chip, +#define CHIPSET(chip, desc) chip, #include "pci_ids/i965_pci_ids.h" #undef CHIPSET };