diff mbox series

[v1,1/1] pci_ids: Keep Intel PCI IDs sorted by value

Message ID 20211209195231.2785-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State Accepted
Delegated to: Bjorn Helgaas
Headers show
Series [v1,1/1] pci_ids: Keep Intel PCI IDs sorted by value | expand

Commit Message

Andy Shevchenko Dec. 9, 2021, 7:52 p.m. UTC
Keep Intel PCI IDs sorted by value.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/linux/pci_ids.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Krzysztof Wilczyński Dec. 9, 2021, 7:56 p.m. UTC | #1
Hi Andy,

> Keep Intel PCI IDs sorted by value.

OK! :-)

I don't mind, and I hope that Bjorn does not mind either!  Some spring
cleaning and such.

>  include/linux/pci_ids.h | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 86678588d191..306201cb9aff 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2738,12 +2738,6 @@
>  #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
>  #define PCI_DEVICE_ID_INTEL_82801EB_12	0x24dc
>  #define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
> -#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
> -#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
> -#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
> -#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
> -#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
> -#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
>  #define PCI_DEVICE_ID_INTEL_82820_HB	0x2500
>  #define PCI_DEVICE_ID_INTEL_82820_UP_HB	0x2501
>  #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
> @@ -2758,14 +2752,15 @@
>  #define PCI_DEVICE_ID_INTEL_82915G_IG	0x2582
>  #define PCI_DEVICE_ID_INTEL_82915GM_HB	0x2590
>  #define PCI_DEVICE_ID_INTEL_82915GM_IG	0x2592
> +#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
> +#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
> +#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
> +#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
> +#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
> +#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
>  #define PCI_DEVICE_ID_INTEL_5000_ERR	0x25F0
>  #define PCI_DEVICE_ID_INTEL_5000_FBD0	0x25F5
>  #define PCI_DEVICE_ID_INTEL_5000_FBD1	0x25F6
> -#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
> -#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
> -#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
> -#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
> -#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
>  #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
>  #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
>  #define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642
> @@ -2777,6 +2772,11 @@
>  #define PCI_DEVICE_ID_INTEL_ESB2_14	0x2698
>  #define PCI_DEVICE_ID_INTEL_ESB2_17	0x269b
>  #define PCI_DEVICE_ID_INTEL_ESB2_18	0x269e
> +#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
> +#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
> +#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
> +#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
> +#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
>  #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
>  #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
>  #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
> @@ -2941,16 +2941,16 @@
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR		0x3cf5	/* 13.6 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1	0x3cf6	/* 12.7 */
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
> -#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
> -#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
> -#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> -#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
>  #define PCI_DEVICE_ID_INTEL_5400_ERR	0x4030
>  #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
>  #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
> -#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
>  #define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
>  #define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
> +#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
> +#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
> +#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> +#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
> +#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
>  #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
>  #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
>  #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020

Thank you!

Reviewed-by: Krzysztof Wilczyński <kw@linux.com>

	Krzysztof
Bjorn Helgaas Dec. 11, 2021, 5:35 p.m. UTC | #2
On Thu, Dec 09, 2021 at 09:52:31PM +0200, Andy Shevchenko wrote:
> Keep Intel PCI IDs sorted by value.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied to pci/misc for v5.17, thanks!

There were a few Intel IDs that used upper-case hex; I lower-cased
them to match the rest.

> ---
>  include/linux/pci_ids.h | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 86678588d191..306201cb9aff 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2738,12 +2738,6 @@
>  #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
>  #define PCI_DEVICE_ID_INTEL_82801EB_12	0x24dc
>  #define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
> -#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
> -#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
> -#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
> -#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
> -#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
> -#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
>  #define PCI_DEVICE_ID_INTEL_82820_HB	0x2500
>  #define PCI_DEVICE_ID_INTEL_82820_UP_HB	0x2501
>  #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
> @@ -2758,14 +2752,15 @@
>  #define PCI_DEVICE_ID_INTEL_82915G_IG	0x2582
>  #define PCI_DEVICE_ID_INTEL_82915GM_HB	0x2590
>  #define PCI_DEVICE_ID_INTEL_82915GM_IG	0x2592
> +#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
> +#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
> +#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
> +#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
> +#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
> +#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
>  #define PCI_DEVICE_ID_INTEL_5000_ERR	0x25F0
>  #define PCI_DEVICE_ID_INTEL_5000_FBD0	0x25F5
>  #define PCI_DEVICE_ID_INTEL_5000_FBD1	0x25F6
> -#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
> -#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
> -#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
> -#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
> -#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
>  #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
>  #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
>  #define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642
> @@ -2777,6 +2772,11 @@
>  #define PCI_DEVICE_ID_INTEL_ESB2_14	0x2698
>  #define PCI_DEVICE_ID_INTEL_ESB2_17	0x269b
>  #define PCI_DEVICE_ID_INTEL_ESB2_18	0x269e
> +#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
> +#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
> +#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
> +#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
> +#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
>  #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
>  #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
>  #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
> @@ -2941,16 +2941,16 @@
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR		0x3cf5	/* 13.6 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1	0x3cf6	/* 12.7 */
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
> -#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
> -#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
> -#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> -#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
>  #define PCI_DEVICE_ID_INTEL_5400_ERR	0x4030
>  #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
>  #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
> -#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
>  #define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
>  #define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
> +#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
> +#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
> +#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> +#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
> +#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
>  #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
>  #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
>  #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
> -- 
> 2.33.0
>
diff mbox series

Patch

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 86678588d191..306201cb9aff 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2738,12 +2738,6 @@ 
 #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
 #define PCI_DEVICE_ID_INTEL_82801EB_12	0x24dc
 #define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
-#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
-#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
-#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
-#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
-#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
-#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
 #define PCI_DEVICE_ID_INTEL_82820_HB	0x2500
 #define PCI_DEVICE_ID_INTEL_82820_UP_HB	0x2501
 #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
@@ -2758,14 +2752,15 @@ 
 #define PCI_DEVICE_ID_INTEL_82915G_IG	0x2582
 #define PCI_DEVICE_ID_INTEL_82915GM_HB	0x2590
 #define PCI_DEVICE_ID_INTEL_82915GM_IG	0x2592
+#define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
+#define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
+#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
+#define PCI_DEVICE_ID_INTEL_ESB_5	0x25a6
+#define PCI_DEVICE_ID_INTEL_ESB_9	0x25ab
+#define PCI_DEVICE_ID_INTEL_ESB_10	0x25ac
 #define PCI_DEVICE_ID_INTEL_5000_ERR	0x25F0
 #define PCI_DEVICE_ID_INTEL_5000_FBD0	0x25F5
 #define PCI_DEVICE_ID_INTEL_5000_FBD1	0x25F6
-#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
-#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
-#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
-#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
-#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
 #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
 #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
 #define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642
@@ -2777,6 +2772,11 @@ 
 #define PCI_DEVICE_ID_INTEL_ESB2_14	0x2698
 #define PCI_DEVICE_ID_INTEL_ESB2_17	0x269b
 #define PCI_DEVICE_ID_INTEL_ESB2_18	0x269e
+#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
+#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772
+#define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
+#define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27A0
+#define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27A2
 #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
 #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
 #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
@@ -2941,16 +2941,16 @@ 
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR		0x3cf5	/* 13.6 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1	0x3cf6	/* 12.7 */
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
-#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
-#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
-#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
-#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
 #define PCI_DEVICE_ID_INTEL_5400_ERR	0x4030
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
-#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
 #define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
 #define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
+#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
+#define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
+#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
+#define PCI_DEVICE_ID_INTEL_5100_22	0x65f6
+#define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
 #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020