[PATCH 01/22] orion5x: Replace comments with C99 initializers

[PATCH 01/22] orion5x: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 87cb47220e82..d762248c6512 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -61,9 +61,9 @@
 
 /* Exposed to userspace, do not change */
 enum {
-	DNS323_REV_A1,	/* 0 */
-	DNS323_REV_B1,	/* 1 */
-	DNS323_REV_C1,	/* 2 */
+	DNS323_REV_A1 = 0,
+	DNS323_REV_B1 = 1,
+	DNS323_REV_C1 = 2,
 };
 
 
-- 
2.35.1

[PATCH 01/22] orion5x: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 87cb47220e82..d762248c6512 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -61,9 +61,9 @@
 
 /* Exposed to userspace, do not change */
 enum {
-	DNS323_REV_A1,	/* 0 */
-	DNS323_REV_B1,	/* 1 */
-	DNS323_REV_C1,	/* 2 */
+	DNS323_REV_A1 = 0,
+	DNS323_REV_B1 = 1,
+	DNS323_REV_C1 = 2,
 };
 
 
-- 
2.35.1

[PATCH 01/22] orion5x: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 87cb47220e82..d762248c6512 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -61,9 +61,9 @@
 
 /* Exposed to userspace, do not change */
 enum {
-	DNS323_REV_A1,	/* 0 */
-	DNS323_REV_B1,	/* 1 */
-	DNS323_REV_C1,	/* 2 */
+	DNS323_REV_A1 = 0,
+	DNS323_REV_B1 = 1,
+	DNS323_REV_C1 = 2,
 };
 
 
-- 
2.35.1

[PATCH 02/22] s3c: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
index d299f124e6dc..bd5471f9973b 100644
--- a/arch/arm/mach-s3c/bast-irq.c
+++ b/arch/arm/mach-s3c/bast-irq.c
@@ -29,22 +29,22 @@
  * the irq is not implemented
 */
 static const unsigned char bast_pc104_irqmasks[] = {
-	0,   /* 0 */
-	0,   /* 1 */
-	0,   /* 2 */
-	1,   /* 3 */
-	0,   /* 4 */
-	2,   /* 5 */
-	0,   /* 6 */
-	4,   /* 7 */
-	0,   /* 8 */
-	0,   /* 9 */
-	8,   /* 10 */
-	0,   /* 11 */
-	0,   /* 12 */
-	0,   /* 13 */
-	0,   /* 14 */
-	0,   /* 15 */
+	[0]  = 0,
+	[1]  = 0,
+	[2]  = 0,
+	[3]  = 1,
+	[4]  = 0,
+	[5]  = 2,
+	[6]  = 0,
+	[7]  = 4,
+	[8]  = 0,
+	[9]  = 0,
+	[10] = 8,
+	[11] = 0,
+	[12] = 0,
+	[13] = 0,
+	[14] = 0,
+	[15] = 0,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
-- 
2.35.1

[PATCH 02/22] s3c: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
index d299f124e6dc..bd5471f9973b 100644
--- a/arch/arm/mach-s3c/bast-irq.c
+++ b/arch/arm/mach-s3c/bast-irq.c
@@ -29,22 +29,22 @@
  * the irq is not implemented
 */
 static const unsigned char bast_pc104_irqmasks[] = {
-	0,   /* 0 */
-	0,   /* 1 */
-	0,   /* 2 */
-	1,   /* 3 */
-	0,   /* 4 */
-	2,   /* 5 */
-	0,   /* 6 */
-	4,   /* 7 */
-	0,   /* 8 */
-	0,   /* 9 */
-	8,   /* 10 */
-	0,   /* 11 */
-	0,   /* 12 */
-	0,   /* 13 */
-	0,   /* 14 */
-	0,   /* 15 */
+	[0]  = 0,
+	[1]  = 0,
+	[2]  = 0,
+	[3]  = 1,
+	[4]  = 0,
+	[5]  = 2,
+	[6]  = 0,
+	[7]  = 4,
+	[8]  = 0,
+	[9]  = 0,
+	[10] = 8,
+	[11] = 0,
+	[12] = 0,
+	[13] = 0,
+	[14] = 0,
+	[15] = 0,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
-- 
2.35.1

[PATCH 02/22] s3c: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
index d299f124e6dc..bd5471f9973b 100644
--- a/arch/arm/mach-s3c/bast-irq.c
+++ b/arch/arm/mach-s3c/bast-irq.c
@@ -29,22 +29,22 @@
  * the irq is not implemented
 */
 static const unsigned char bast_pc104_irqmasks[] = {
-	0,   /* 0 */
-	0,   /* 1 */
-	0,   /* 2 */
-	1,   /* 3 */
-	0,   /* 4 */
-	2,   /* 5 */
-	0,   /* 6 */
-	4,   /* 7 */
-	0,   /* 8 */
-	0,   /* 9 */
-	8,   /* 10 */
-	0,   /* 11 */
-	0,   /* 12 */
-	0,   /* 13 */
-	0,   /* 14 */
-	0,   /* 15 */
+	[0]  = 0,
+	[1]  = 0,
+	[2]  = 0,
+	[3]  = 1,
+	[4]  = 0,
+	[5]  = 2,
+	[6]  = 0,
+	[7]  = 4,
+	[8]  = 0,
+	[9]  = 0,
+	[10] = 8,
+	[11] = 0,
+	[12] = 0,
+	[13] = 0,
+	[14] = 0,
+	[15] = 0,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };
-- 
2.35.1

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 17:58 +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
[]
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
[]
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,
>  };

I don't find this better than the initial array.

>  
>  static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

For the same reason this array is just an array
without the specified indexing.

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 17:58 +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
[]
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
[]
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,
>  };

I don't find this better than the initial array.

>  
>  static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

For the same reason this array is just an array
without the specified indexing.

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 17:58 +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
[]
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
[]
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,
>  };

I don't find this better than the initial array.

>  
>  static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

For the same reason this array is just an array
without the specified indexing.

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:49PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

I'm a bit puzzled by "because the kernel supports them now". Designated
initializers are not purely a C99 feature... it is also a GNU C extension
to C89. This language feature has been used by the kernel for a very long time
(well over a decade).

On other words it would be much more effective to advocate for the
change by saying "because the code is clearer and easier to read" rather
than "because we can".


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
> index d299f124e6dc..bd5471f9973b 100644
> --- a/arch/arm/mach-s3c/bast-irq.c
> +++ b/arch/arm/mach-s3c/bast-irq.c
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,

Shouldn't this just be as follows (in order to match bast_pc104_irqs)?

+static const unsigned char bast_pc104_irqmasks[16] = {
+	[3]  = 1,
+	[5]  = 2,
+	[7]  = 4,
+	[10] = 8,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };


Daniel.

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:49PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

I'm a bit puzzled by "because the kernel supports them now". Designated
initializers are not purely a C99 feature... it is also a GNU C extension
to C89. This language feature has been used by the kernel for a very long time
(well over a decade).

On other words it would be much more effective to advocate for the
change by saying "because the code is clearer and easier to read" rather
than "because we can".


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
> index d299f124e6dc..bd5471f9973b 100644
> --- a/arch/arm/mach-s3c/bast-irq.c
> +++ b/arch/arm/mach-s3c/bast-irq.c
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,

Shouldn't this just be as follows (in order to match bast_pc104_irqs)?

+static const unsigned char bast_pc104_irqmasks[16] = {
+	[3]  = 1,
+	[5]  = 2,
+	[7]  = 4,
+	[10] = 8,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };


Daniel.

Re: [PATCH 02/22] s3c: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:49PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

I'm a bit puzzled by "because the kernel supports them now". Designated
initializers are not purely a C99 feature... it is also a GNU C extension
to C89. This language feature has been used by the kernel for a very long time
(well over a decade).

On other words it would be much more effective to advocate for the
change by saying "because the code is clearer and easier to read" rather
than "because we can".


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-s3c/bast-irq.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c
> index d299f124e6dc..bd5471f9973b 100644
> --- a/arch/arm/mach-s3c/bast-irq.c
> +++ b/arch/arm/mach-s3c/bast-irq.c
> @@ -29,22 +29,22 @@
>   * the irq is not implemented
>  */
>  static const unsigned char bast_pc104_irqmasks[] = {
> -	0,   /* 0 */
> -	0,   /* 1 */
> -	0,   /* 2 */
> -	1,   /* 3 */
> -	0,   /* 4 */
> -	2,   /* 5 */
> -	0,   /* 6 */
> -	4,   /* 7 */
> -	0,   /* 8 */
> -	0,   /* 9 */
> -	8,   /* 10 */
> -	0,   /* 11 */
> -	0,   /* 12 */
> -	0,   /* 13 */
> -	0,   /* 14 */
> -	0,   /* 15 */
> +	[0]  = 0,
> +	[1]  = 0,
> +	[2]  = 0,
> +	[3]  = 1,
> +	[4]  = 0,
> +	[5]  = 2,
> +	[6]  = 0,
> +	[7]  = 4,
> +	[8]  = 0,
> +	[9]  = 0,
> +	[10] = 8,
> +	[11] = 0,
> +	[12] = 0,
> +	[13] = 0,
> +	[14] = 0,
> +	[15] = 0,

Shouldn't this just be as follows (in order to match bast_pc104_irqs)?

+static const unsigned char bast_pc104_irqmasks[16] = {
+	[3]  = 1,
+	[5]  = 2,
+	[7]  = 4,
+	[10] = 8,
 };
 
 static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };


Daniel.

[PATCH 03/22] ia64: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/ia64/kernel/kprobes.c | 64 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 1a7bab1c5d7c..2d6a9388201e 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -29,38 +29,38 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
 
 enum instruction_type {A, I, M, F, B, L, X, u};
 static enum instruction_type bundle_encoding[32][3] = {
-  { M, I, I },				/* 00 */
-  { M, I, I },				/* 01 */
-  { M, I, I },				/* 02 */
-  { M, I, I },				/* 03 */
-  { M, L, X },				/* 04 */
-  { M, L, X },				/* 05 */
-  { u, u, u },  			/* 06 */
-  { u, u, u },  			/* 07 */
-  { M, M, I },				/* 08 */
-  { M, M, I },				/* 09 */
-  { M, M, I },				/* 0A */
-  { M, M, I },				/* 0B */
-  { M, F, I },				/* 0C */
-  { M, F, I },				/* 0D */
-  { M, M, F },				/* 0E */
-  { M, M, F },				/* 0F */
-  { M, I, B },				/* 10 */
-  { M, I, B },				/* 11 */
-  { M, B, B },				/* 12 */
-  { M, B, B },				/* 13 */
-  { u, u, u },  			/* 14 */
-  { u, u, u },  			/* 15 */
-  { B, B, B },				/* 16 */
-  { B, B, B },				/* 17 */
-  { M, M, B },				/* 18 */
-  { M, M, B },				/* 19 */
-  { u, u, u },  			/* 1A */
-  { u, u, u },  			/* 1B */
-  { M, F, B },				/* 1C */
-  { M, F, B },				/* 1D */
-  { u, u, u },  			/* 1E */
-  { u, u, u },  			/* 1F */
+	[0x00] = { M, I, I },
+	[0x01] = { M, I, I },
+	[0x02] = { M, I, I },
+	[0x03] = { M, I, I },
+	[0x04] = { M, L, X },
+	[0x05] = { M, L, X },
+	[0x06] = { u, u, u },
+	[0x07] = { u, u, u },
+	[0x08] = { M, M, I },
+	[0x09] = { M, M, I },
+	[0x0A] = { M, M, I },
+	[0x0B] = { M, M, I },
+	[0x0C] = { M, F, I },
+	[0x0D] = { M, F, I },
+	[0x0E] = { M, M, F },
+	[0x0F] = { M, M, F },
+	[0x10] = { M, I, B },
+	[0x11] = { M, I, B },
+	[0x12] = { M, B, B },
+	[0x13] = { M, B, B },
+	[0x14] = { u, u, u },
+	[0x15] = { u, u, u },
+	[0x16] = { B, B, B },
+	[0x17] = { B, B, B },
+	[0x18] = { M, M, B },
+	[0x19] = { M, M, B },
+	[0x1A] = { u, u, u },
+	[0x1B] = { u, u, u },
+	[0x1C] = { M, F, B },
+	[0x1D] = { M, F, B },
+	[0x1E] = { u, u, u },
+	[0x1F] = { u, u, u },
 };
 
 /* Insert a long branch code */
-- 
2.35.1

[PATCH 03/22] ia64: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/ia64/kernel/kprobes.c | 64 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 1a7bab1c5d7c..2d6a9388201e 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -29,38 +29,38 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
 
 enum instruction_type {A, I, M, F, B, L, X, u};
 static enum instruction_type bundle_encoding[32][3] = {
-  { M, I, I },				/* 00 */
-  { M, I, I },				/* 01 */
-  { M, I, I },				/* 02 */
-  { M, I, I },				/* 03 */
-  { M, L, X },				/* 04 */
-  { M, L, X },				/* 05 */
-  { u, u, u },  			/* 06 */
-  { u, u, u },  			/* 07 */
-  { M, M, I },				/* 08 */
-  { M, M, I },				/* 09 */
-  { M, M, I },				/* 0A */
-  { M, M, I },				/* 0B */
-  { M, F, I },				/* 0C */
-  { M, F, I },				/* 0D */
-  { M, M, F },				/* 0E */
-  { M, M, F },				/* 0F */
-  { M, I, B },				/* 10 */
-  { M, I, B },				/* 11 */
-  { M, B, B },				/* 12 */
-  { M, B, B },				/* 13 */
-  { u, u, u },  			/* 14 */
-  { u, u, u },  			/* 15 */
-  { B, B, B },				/* 16 */
-  { B, B, B },				/* 17 */
-  { M, M, B },				/* 18 */
-  { M, M, B },				/* 19 */
-  { u, u, u },  			/* 1A */
-  { u, u, u },  			/* 1B */
-  { M, F, B },				/* 1C */
-  { M, F, B },				/* 1D */
-  { u, u, u },  			/* 1E */
-  { u, u, u },  			/* 1F */
+	[0x00] = { M, I, I },
+	[0x01] = { M, I, I },
+	[0x02] = { M, I, I },
+	[0x03] = { M, I, I },
+	[0x04] = { M, L, X },
+	[0x05] = { M, L, X },
+	[0x06] = { u, u, u },
+	[0x07] = { u, u, u },
+	[0x08] = { M, M, I },
+	[0x09] = { M, M, I },
+	[0x0A] = { M, M, I },
+	[0x0B] = { M, M, I },
+	[0x0C] = { M, F, I },
+	[0x0D] = { M, F, I },
+	[0x0E] = { M, M, F },
+	[0x0F] = { M, M, F },
+	[0x10] = { M, I, B },
+	[0x11] = { M, I, B },
+	[0x12] = { M, B, B },
+	[0x13] = { M, B, B },
+	[0x14] = { u, u, u },
+	[0x15] = { u, u, u },
+	[0x16] = { B, B, B },
+	[0x17] = { B, B, B },
+	[0x18] = { M, M, B },
+	[0x19] = { M, M, B },
+	[0x1A] = { u, u, u },
+	[0x1B] = { u, u, u },
+	[0x1C] = { M, F, B },
+	[0x1D] = { M, F, B },
+	[0x1E] = { u, u, u },
+	[0x1F] = { u, u, u },
 };
 
 /* Insert a long branch code */
-- 
2.35.1

[PATCH 03/22] ia64: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/ia64/kernel/kprobes.c | 64 +++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 1a7bab1c5d7c..2d6a9388201e 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -29,38 +29,38 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
 
 enum instruction_type {A, I, M, F, B, L, X, u};
 static enum instruction_type bundle_encoding[32][3] = {
-  { M, I, I },				/* 00 */
-  { M, I, I },				/* 01 */
-  { M, I, I },				/* 02 */
-  { M, I, I },				/* 03 */
-  { M, L, X },				/* 04 */
-  { M, L, X },				/* 05 */
-  { u, u, u },  			/* 06 */
-  { u, u, u },  			/* 07 */
-  { M, M, I },				/* 08 */
-  { M, M, I },				/* 09 */
-  { M, M, I },				/* 0A */
-  { M, M, I },				/* 0B */
-  { M, F, I },				/* 0C */
-  { M, F, I },				/* 0D */
-  { M, M, F },				/* 0E */
-  { M, M, F },				/* 0F */
-  { M, I, B },				/* 10 */
-  { M, I, B },				/* 11 */
-  { M, B, B },				/* 12 */
-  { M, B, B },				/* 13 */
-  { u, u, u },  			/* 14 */
-  { u, u, u },  			/* 15 */
-  { B, B, B },				/* 16 */
-  { B, B, B },				/* 17 */
-  { M, M, B },				/* 18 */
-  { M, M, B },				/* 19 */
-  { u, u, u },  			/* 1A */
-  { u, u, u },  			/* 1B */
-  { M, F, B },				/* 1C */
-  { M, F, B },				/* 1D */
-  { u, u, u },  			/* 1E */
-  { u, u, u },  			/* 1F */
+	[0x00] = { M, I, I },
+	[0x01] = { M, I, I },
+	[0x02] = { M, I, I },
+	[0x03] = { M, I, I },
+	[0x04] = { M, L, X },
+	[0x05] = { M, L, X },
+	[0x06] = { u, u, u },
+	[0x07] = { u, u, u },
+	[0x08] = { M, M, I },
+	[0x09] = { M, M, I },
+	[0x0A] = { M, M, I },
+	[0x0B] = { M, M, I },
+	[0x0C] = { M, F, I },
+	[0x0D] = { M, F, I },
+	[0x0E] = { M, M, F },
+	[0x0F] = { M, M, F },
+	[0x10] = { M, I, B },
+	[0x11] = { M, I, B },
+	[0x12] = { M, B, B },
+	[0x13] = { M, B, B },
+	[0x14] = { u, u, u },
+	[0x15] = { u, u, u },
+	[0x16] = { B, B, B },
+	[0x17] = { B, B, B },
+	[0x18] = { M, M, B },
+	[0x19] = { M, M, B },
+	[0x1A] = { u, u, u },
+	[0x1B] = { u, u, u },
+	[0x1C] = { M, F, B },
+	[0x1D] = { M, F, B },
+	[0x1E] = { u, u, u },
+	[0x1F] = { u, u, u },
 };
 
 /* Insert a long branch code */
-- 
2.35.1

[PATCH 04/22] x86: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/x86/include/asm/kgdb.h   | 80 +++++++++++++++++------------------
 arch/x86/kernel/cpu/mtrr/if.c | 14 +++---
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h
index aacaf2502bd2..a9161e2f8b63 100644
--- a/arch/x86/include/asm/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
@@ -25,52 +25,52 @@
  */
 #ifdef CONFIG_X86_32
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_CX,			/* 1 */
-	GDB_DX,			/* 2 */
-	GDB_BX,			/* 3 */
-	GDB_SP,			/* 4 */
-	GDB_BP,			/* 5 */
-	GDB_SI,			/* 6 */
-	GDB_DI,			/* 7 */
-	GDB_PC,			/* 8 also known as eip */
-	GDB_PS,			/* 9 also known as eflags */
-	GDB_CS,			/* 10 */
-	GDB_SS,			/* 11 */
-	GDB_DS,			/* 12 */
-	GDB_ES,			/* 13 */
-	GDB_FS,			/* 14 */
-	GDB_GS,			/* 15 */
+	GDB_AX = 0,
+	GDB_CX = 1,
+	GDB_DX = 2,
+	GDB_BX = 3,
+	GDB_SP = 4,
+	GDB_BP = 5,
+	GDB_SI = 6,
+	GDB_DI = 7,
+	GDB_PC = 8,			/* also known as eip */
+	GDB_PS = 9,			/* also known as eflags */
+	GDB_CS = 10,
+	GDB_SS = 11,
+	GDB_DS = 12,
+	GDB_ES = 13,
+	GDB_FS = 14,
+	GDB_GS = 15,
 };
 #define GDB_ORIG_AX		41
 #define DBG_MAX_REG_NUM		16
 #define NUMREGBYTES		((GDB_GS+1)*4)
 #else /* ! CONFIG_X86_32 */
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_BX,			/* 1 */
-	GDB_CX,			/* 2 */
-	GDB_DX,			/* 3 */
-	GDB_SI,			/* 4 */
-	GDB_DI,			/* 5 */
-	GDB_BP,			/* 6 */
-	GDB_SP,			/* 7 */
-	GDB_R8,			/* 8 */
-	GDB_R9,			/* 9 */
-	GDB_R10,		/* 10 */
-	GDB_R11,		/* 11 */
-	GDB_R12,		/* 12 */
-	GDB_R13,		/* 13 */
-	GDB_R14,		/* 14 */
-	GDB_R15,		/* 15 */
-	GDB_PC,			/* 16 */
-	GDB_PS,			/* 17 */
-	GDB_CS,			/* 18 */
-	GDB_SS,			/* 19 */
-	GDB_DS,			/* 20 */
-	GDB_ES,			/* 21 */
-	GDB_FS,			/* 22 */
-	GDB_GS,			/* 23 */
+	GDB_AX   =  0,
+	GDB_BX   =  1,
+	GDB_CX   =  2,
+	GDB_DX   =  3,
+	GDB_SI   =  4,
+	GDB_DI   =  5,
+	GDB_BP   =  6,
+	GDB_SP   =  7,
+	GDB_R8   =  8,
+	GDB_R9   =  9,
+	GDB_R10  = 10,
+	GDB_R11  = 11,
+	GDB_R12  = 12,
+	GDB_R13  = 13,
+	GDB_R14  = 14,
+	GDB_R15  = 15,
+	GDB_PC   = 16,			/* also known as eip */
+	GDB_PS   = 17,			/* also known as eflags */
+	GDB_CS   = 18,
+	GDB_SS   = 19,
+	GDB_DS   = 20,
+	GDB_ES   = 21,
+	GDB_FS   = 22,
+	GDB_GS   = 23,
 };
 #define GDB_ORIG_AX		57
 #define DBG_MAX_REG_NUM		24
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index a5c506f6da7f..7664a672f414 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -18,13 +18,13 @@
 
 static const char *const mtrr_strings[MTRR_NUM_TYPES] =
 {
-	"uncachable",		/* 0 */
-	"write-combining",	/* 1 */
-	"?",			/* 2 */
-	"?",			/* 3 */
-	"write-through",	/* 4 */
-	"write-protect",	/* 5 */
-	"write-back",		/* 6 */
+	[0] = "uncachable",
+	[1] = "write-combining",
+	[2] = "?",
+	[3] = "?",
+	[4] = "write-through",
+	[5] = "write-protect",
+	[6] = "write-back",
 };
 
 const char *mtrr_attrib_to_str(int x)
-- 
2.35.1

[PATCH 04/22] x86: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/x86/include/asm/kgdb.h   | 80 +++++++++++++++++------------------
 arch/x86/kernel/cpu/mtrr/if.c | 14 +++---
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h
index aacaf2502bd2..a9161e2f8b63 100644
--- a/arch/x86/include/asm/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
@@ -25,52 +25,52 @@
  */
 #ifdef CONFIG_X86_32
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_CX,			/* 1 */
-	GDB_DX,			/* 2 */
-	GDB_BX,			/* 3 */
-	GDB_SP,			/* 4 */
-	GDB_BP,			/* 5 */
-	GDB_SI,			/* 6 */
-	GDB_DI,			/* 7 */
-	GDB_PC,			/* 8 also known as eip */
-	GDB_PS,			/* 9 also known as eflags */
-	GDB_CS,			/* 10 */
-	GDB_SS,			/* 11 */
-	GDB_DS,			/* 12 */
-	GDB_ES,			/* 13 */
-	GDB_FS,			/* 14 */
-	GDB_GS,			/* 15 */
+	GDB_AX = 0,
+	GDB_CX = 1,
+	GDB_DX = 2,
+	GDB_BX = 3,
+	GDB_SP = 4,
+	GDB_BP = 5,
+	GDB_SI = 6,
+	GDB_DI = 7,
+	GDB_PC = 8,			/* also known as eip */
+	GDB_PS = 9,			/* also known as eflags */
+	GDB_CS = 10,
+	GDB_SS = 11,
+	GDB_DS = 12,
+	GDB_ES = 13,
+	GDB_FS = 14,
+	GDB_GS = 15,
 };
 #define GDB_ORIG_AX		41
 #define DBG_MAX_REG_NUM		16
 #define NUMREGBYTES		((GDB_GS+1)*4)
 #else /* ! CONFIG_X86_32 */
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_BX,			/* 1 */
-	GDB_CX,			/* 2 */
-	GDB_DX,			/* 3 */
-	GDB_SI,			/* 4 */
-	GDB_DI,			/* 5 */
-	GDB_BP,			/* 6 */
-	GDB_SP,			/* 7 */
-	GDB_R8,			/* 8 */
-	GDB_R9,			/* 9 */
-	GDB_R10,		/* 10 */
-	GDB_R11,		/* 11 */
-	GDB_R12,		/* 12 */
-	GDB_R13,		/* 13 */
-	GDB_R14,		/* 14 */
-	GDB_R15,		/* 15 */
-	GDB_PC,			/* 16 */
-	GDB_PS,			/* 17 */
-	GDB_CS,			/* 18 */
-	GDB_SS,			/* 19 */
-	GDB_DS,			/* 20 */
-	GDB_ES,			/* 21 */
-	GDB_FS,			/* 22 */
-	GDB_GS,			/* 23 */
+	GDB_AX   =  0,
+	GDB_BX   =  1,
+	GDB_CX   =  2,
+	GDB_DX   =  3,
+	GDB_SI   =  4,
+	GDB_DI   =  5,
+	GDB_BP   =  6,
+	GDB_SP   =  7,
+	GDB_R8   =  8,
+	GDB_R9   =  9,
+	GDB_R10  = 10,
+	GDB_R11  = 11,
+	GDB_R12  = 12,
+	GDB_R13  = 13,
+	GDB_R14  = 14,
+	GDB_R15  = 15,
+	GDB_PC   = 16,			/* also known as eip */
+	GDB_PS   = 17,			/* also known as eflags */
+	GDB_CS   = 18,
+	GDB_SS   = 19,
+	GDB_DS   = 20,
+	GDB_ES   = 21,
+	GDB_FS   = 22,
+	GDB_GS   = 23,
 };
 #define GDB_ORIG_AX		57
 #define DBG_MAX_REG_NUM		24
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index a5c506f6da7f..7664a672f414 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -18,13 +18,13 @@
 
 static const char *const mtrr_strings[MTRR_NUM_TYPES] =
 {
-	"uncachable",		/* 0 */
-	"write-combining",	/* 1 */
-	"?",			/* 2 */
-	"?",			/* 3 */
-	"write-through",	/* 4 */
-	"write-protect",	/* 5 */
-	"write-back",		/* 6 */
+	[0] = "uncachable",
+	[1] = "write-combining",
+	[2] = "?",
+	[3] = "?",
+	[4] = "write-through",
+	[5] = "write-protect",
+	[6] = "write-back",
 };
 
 const char *mtrr_attrib_to_str(int x)
-- 
2.35.1

[PATCH 04/22] x86: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 arch/x86/include/asm/kgdb.h   | 80 +++++++++++++++++------------------
 arch/x86/kernel/cpu/mtrr/if.c | 14 +++---
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h
index aacaf2502bd2..a9161e2f8b63 100644
--- a/arch/x86/include/asm/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
@@ -25,52 +25,52 @@
  */
 #ifdef CONFIG_X86_32
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_CX,			/* 1 */
-	GDB_DX,			/* 2 */
-	GDB_BX,			/* 3 */
-	GDB_SP,			/* 4 */
-	GDB_BP,			/* 5 */
-	GDB_SI,			/* 6 */
-	GDB_DI,			/* 7 */
-	GDB_PC,			/* 8 also known as eip */
-	GDB_PS,			/* 9 also known as eflags */
-	GDB_CS,			/* 10 */
-	GDB_SS,			/* 11 */
-	GDB_DS,			/* 12 */
-	GDB_ES,			/* 13 */
-	GDB_FS,			/* 14 */
-	GDB_GS,			/* 15 */
+	GDB_AX = 0,
+	GDB_CX = 1,
+	GDB_DX = 2,
+	GDB_BX = 3,
+	GDB_SP = 4,
+	GDB_BP = 5,
+	GDB_SI = 6,
+	GDB_DI = 7,
+	GDB_PC = 8,			/* also known as eip */
+	GDB_PS = 9,			/* also known as eflags */
+	GDB_CS = 10,
+	GDB_SS = 11,
+	GDB_DS = 12,
+	GDB_ES = 13,
+	GDB_FS = 14,
+	GDB_GS = 15,
 };
 #define GDB_ORIG_AX		41
 #define DBG_MAX_REG_NUM		16
 #define NUMREGBYTES		((GDB_GS+1)*4)
 #else /* ! CONFIG_X86_32 */
 enum regnames {
-	GDB_AX,			/* 0 */
-	GDB_BX,			/* 1 */
-	GDB_CX,			/* 2 */
-	GDB_DX,			/* 3 */
-	GDB_SI,			/* 4 */
-	GDB_DI,			/* 5 */
-	GDB_BP,			/* 6 */
-	GDB_SP,			/* 7 */
-	GDB_R8,			/* 8 */
-	GDB_R9,			/* 9 */
-	GDB_R10,		/* 10 */
-	GDB_R11,		/* 11 */
-	GDB_R12,		/* 12 */
-	GDB_R13,		/* 13 */
-	GDB_R14,		/* 14 */
-	GDB_R15,		/* 15 */
-	GDB_PC,			/* 16 */
-	GDB_PS,			/* 17 */
-	GDB_CS,			/* 18 */
-	GDB_SS,			/* 19 */
-	GDB_DS,			/* 20 */
-	GDB_ES,			/* 21 */
-	GDB_FS,			/* 22 */
-	GDB_GS,			/* 23 */
+	GDB_AX   =  0,
+	GDB_BX   =  1,
+	GDB_CX   =  2,
+	GDB_DX   =  3,
+	GDB_SI   =  4,
+	GDB_DI   =  5,
+	GDB_BP   =  6,
+	GDB_SP   =  7,
+	GDB_R8   =  8,
+	GDB_R9   =  9,
+	GDB_R10  = 10,
+	GDB_R11  = 11,
+	GDB_R12  = 12,
+	GDB_R13  = 13,
+	GDB_R14  = 14,
+	GDB_R15  = 15,
+	GDB_PC   = 16,			/* also known as eip */
+	GDB_PS   = 17,			/* also known as eflags */
+	GDB_CS   = 18,
+	GDB_SS   = 19,
+	GDB_DS   = 20,
+	GDB_ES   = 21,
+	GDB_FS   = 22,
+	GDB_GS   = 23,
 };
 #define GDB_ORIG_AX		57
 #define DBG_MAX_REG_NUM		24
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index a5c506f6da7f..7664a672f414 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -18,13 +18,13 @@
 
 static const char *const mtrr_strings[MTRR_NUM_TYPES]  {
-	"uncachable",		/* 0 */
-	"write-combining",	/* 1 */
-	"?",			/* 2 */
-	"?",			/* 3 */
-	"write-through",	/* 4 */
-	"write-protect",	/* 5 */
-	"write-back",		/* 6 */
+	[0] = "uncachable",
+	[1] = "write-combining",
+	[2] = "?",
+	[3] = "?",
+	[4] = "write-through",
+	[5] = "write-protect",
+	[6] = "write-back",
 };
 
 const char *mtrr_attrib_to_str(int x)
-- 
2.35.1

Re: [PATCH 04/22] x86: Replace comments with C99 initializers

[Thomas Gleixner]

Benjamin,

On Sat, Mar 26 2022 at 17:58, Benjamin Stürz wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

the kernel has used designated array initializers for a very long time
simply because the kernel did not use pure C89 but C89 with GNU
extensions, i.e. -std=gnu89, which include designated array
initializers. GCC supports this since 1998 with =gnu89, so 'now' is
more than slightly off.

Explicit value assignment to enum constants are a different story. They
are neither designated initializers nor new in C99. The following
paragraph from the standard has not been changed since C89:

   "The identifiers in an enumerator list are declared as constants that
    have type int and may appear wherever such are permitted. An
    enumerator with = defines its enumeration constant as the value of
    the constant expression. If the first enumerator has no =, the value
    of its enumeration constant is 0. Each subsequent enumerator with no
    = defines its enumeration constant as the value of the constant
    expression obtained by adding 1 to the value of the previous
    enumeration constant. (The use of enumerators with = may produce
    enumeration constants with values that duplicate other values in the
    same enumeration.)"

Please make sure that your changelogs are factual. Making uninformed
claims is not helping your cause.

The most important part is the WHY:

    Why is the current code suboptimal?

    Why is the proposed change making it better, more correct, less
    error prone?

If you can't come up with proper technical answers for these questions
then why should it be changed?

>  enum regnames {
> -	GDB_AX,			/* 0 */
> +	GDB_AX = 0,

Linear enums without value assignment like here are not a problem at
all. Simply because they are well defined and well understood. See the
above quote of the standard.

Whether the explicit assignment is an improvement over the trailing
comment or not is a matter of taste and preference. There is absolutely
_zero_ technical advantage in using explicit value assignments in _this_
case and neither in many other cases of your series.

Also completely removing the comments here loses information:

> -	GDB_PC,			/* 8 also known as eip */
> -	GDB_PS,			/* 9 also known as eflags */

Can you map _PC to EIP and _PS to EFLAGS? I can't without digging
deep...

>  static const char *const mtrr_strings[MTRR_NUM_TYPES] =
>  {
> -	"uncachable",		/* 0 */
> -	"write-combining",	/* 1 */
> -	"?",			/* 2 */
> -	"?",			/* 3 */
> -	"write-through",	/* 4 */
> -	"write-protect",	/* 5 */
> -	"write-back",		/* 6 */
> +	[0] = "uncachable",
> +	[1] = "write-combining",
> +	[2] = "?",
> +	[3] = "?",
> +	[4] = "write-through",
> +	[5] = "write-protect",
> +	[6] = "write-back",

Again, while not supported in C89, the kernel uses designators in array
initializers for a very long time...

Linear array initializers like the mtrr strings are not a real problem
simply because there is no correlation and the code using the array
still has to make sure that the index into the array is what it expects
to be the content. Changing it from C89 automatic to explicit C99
designators does not help there at all.

It becomes a different story if you combine [enum] constants and arrays
and use the constants in code because then the change to the constants
will immediately be reflected in the array initializer. I.e. for this
case:

enum foo {
     BAR,
     BAZ,
     RAB,
     ZAR,
};

char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
};

it makes a difference if someone does:

  enum foo {
     BAR,
     BAZ,
+    MOO,
     RAB,
     ZAR,
  };

because then the related array initializer is obviously out of
order. With:

char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
};

the existing values are still in the same place, just the newly added
value is a NULL pointer. It also does not matter when the fixup for the
missing array entry becomes:

  char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
+    [MOO] = "moo",     
  };

because the compiled result is still in enum order. While doing

  char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
+    "moo",
  };

would be blantantly wrong. See?

But that does not apply to any of your proposed changes.

So you really need to look at things and not just throw a mechanical
change scheme at it, which results even in failures like reported by
the 0-day robot against patch 10/22.

That said, I'm not completely opposed to those changes, but you really
have to come up with good reasons why they make sense aside of
cosmetical reasons.

Btw, the really important change regarding initializers between C89 and
C99 was the ability to initialize struct members explicitly.

In C89 the only way to initialize a struct was

   = { a, b, c, d }

which was way more error prone than the enum/array initializers. The
dangerous part or C89 struct initializers are changes to the struct
unless the change of the struct is actually triggering a type
mismatch.

But even that needs some serious inspection whether there is confusion
potential or not. The harmless example is a file local:

struct foo {
       unsigned int      id;
       unsigned int      flags;
};

and the C89 style initializer:

static struct foo[] {
       { ID_A, 0x01 },
       { ID_B, 0x02 },
       { ID_C, 0x01 },
};

which has a very low confusion potential simply because it's scope is
file local and well defined and unlikely to change.

A globally used structure is a different problem especially when it
becomes necessary to insert a new struct member in the middle instead of
appending it, changing the order, removing a member... That ends up in a
hard to diagnose disaster with C89 style unnamed initializers pretty
fast.

Ideally C89 style unnamed struct initializers should not be used at all,
but again it's a matter of common sense and justification whether it's
worth to change it just because.

Thanks,

        tglx

Re: [PATCH 04/22] x86: Replace comments with C99 initializers

[Thomas Gleixner]

Benjamin,

On Sat, Mar 26 2022 at 17:58, Benjamin Stürz wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

the kernel has used designated array initializers for a very long time
simply because the kernel did not use pure C89 but C89 with GNU
extensions, i.e. -std=gnu89, which include designated array
initializers. GCC supports this since 1998 with =gnu89, so 'now' is
more than slightly off.

Explicit value assignment to enum constants are a different story. They
are neither designated initializers nor new in C99. The following
paragraph from the standard has not been changed since C89:

   "The identifiers in an enumerator list are declared as constants that
    have type int and may appear wherever such are permitted. An
    enumerator with = defines its enumeration constant as the value of
    the constant expression. If the first enumerator has no =, the value
    of its enumeration constant is 0. Each subsequent enumerator with no
    = defines its enumeration constant as the value of the constant
    expression obtained by adding 1 to the value of the previous
    enumeration constant. (The use of enumerators with = may produce
    enumeration constants with values that duplicate other values in the
    same enumeration.)"

Please make sure that your changelogs are factual. Making uninformed
claims is not helping your cause.

The most important part is the WHY:

    Why is the current code suboptimal?

    Why is the proposed change making it better, more correct, less
    error prone?

If you can't come up with proper technical answers for these questions
then why should it be changed?

>  enum regnames {
> -	GDB_AX,			/* 0 */
> +	GDB_AX = 0,

Linear enums without value assignment like here are not a problem at
all. Simply because they are well defined and well understood. See the
above quote of the standard.

Whether the explicit assignment is an improvement over the trailing
comment or not is a matter of taste and preference. There is absolutely
_zero_ technical advantage in using explicit value assignments in _this_
case and neither in many other cases of your series.

Also completely removing the comments here loses information:

> -	GDB_PC,			/* 8 also known as eip */
> -	GDB_PS,			/* 9 also known as eflags */

Can you map _PC to EIP and _PS to EFLAGS? I can't without digging
deep...

>  static const char *const mtrr_strings[MTRR_NUM_TYPES] =
>  {
> -	"uncachable",		/* 0 */
> -	"write-combining",	/* 1 */
> -	"?",			/* 2 */
> -	"?",			/* 3 */
> -	"write-through",	/* 4 */
> -	"write-protect",	/* 5 */
> -	"write-back",		/* 6 */
> +	[0] = "uncachable",
> +	[1] = "write-combining",
> +	[2] = "?",
> +	[3] = "?",
> +	[4] = "write-through",
> +	[5] = "write-protect",
> +	[6] = "write-back",

Again, while not supported in C89, the kernel uses designators in array
initializers for a very long time...

Linear array initializers like the mtrr strings are not a real problem
simply because there is no correlation and the code using the array
still has to make sure that the index into the array is what it expects
to be the content. Changing it from C89 automatic to explicit C99
designators does not help there at all.

It becomes a different story if you combine [enum] constants and arrays
and use the constants in code because then the change to the constants
will immediately be reflected in the array initializer. I.e. for this
case:

enum foo {
     BAR,
     BAZ,
     RAB,
     ZAR,
};

char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
};

it makes a difference if someone does:

  enum foo {
     BAR,
     BAZ,
+    MOO,
     RAB,
     ZAR,
  };

because then the related array initializer is obviously out of
order. With:

char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
};

the existing values are still in the same place, just the newly added
value is a NULL pointer. It also does not matter when the fixup for the
missing array entry becomes:

  char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
+    [MOO] = "moo",     
  };

because the compiled result is still in enum order. While doing

  char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
+    "moo",
  };

would be blantantly wrong. See?

But that does not apply to any of your proposed changes.

So you really need to look at things and not just throw a mechanical
change scheme at it, which results even in failures like reported by
the 0-day robot against patch 10/22.

That said, I'm not completely opposed to those changes, but you really
have to come up with good reasons why they make sense aside of
cosmetical reasons.

Btw, the really important change regarding initializers between C89 and
C99 was the ability to initialize struct members explicitly.

In C89 the only way to initialize a struct was

   = { a, b, c, d }

which was way more error prone than the enum/array initializers. The
dangerous part or C89 struct initializers are changes to the struct
unless the change of the struct is actually triggering a type
mismatch.

But even that needs some serious inspection whether there is confusion
potential or not. The harmless example is a file local:

struct foo {
       unsigned int      id;
       unsigned int      flags;
};

and the C89 style initializer:

static struct foo[] {
       { ID_A, 0x01 },
       { ID_B, 0x02 },
       { ID_C, 0x01 },
};

which has a very low confusion potential simply because it's scope is
file local and well defined and unlikely to change.

A globally used structure is a different problem especially when it
becomes necessary to insert a new struct member in the middle instead of
appending it, changing the order, removing a member... That ends up in a
hard to diagnose disaster with C89 style unnamed initializers pretty
fast.

Ideally C89 style unnamed struct initializers should not be used at all,
but again it's a matter of common sense and justification whether it's
worth to change it just because.

Thanks,

        tglx

Re: [PATCH 04/22] x86: Replace comments with C99 initializers

[Thomas Gleixner]

Benjamin,

On Sat, Mar 26 2022 at 17:58, Benjamin Stürz wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

the kernel has used designated array initializers for a very long time
simply because the kernel did not use pure C89 but C89 with GNU
extensions, i.e. -std=gnu89, which include designated array
initializers. GCC supports this since 1998 with =gnu89, so 'now' is
more than slightly off.

Explicit value assignment to enum constants are a different story. They
are neither designated initializers nor new in C99. The following
paragraph from the standard has not been changed since C89:

   "The identifiers in an enumerator list are declared as constants that
    have type int and may appear wherever such are permitted. An
    enumerator with = defines its enumeration constant as the value of
    the constant expression. If the first enumerator has no =, the value
    of its enumeration constant is 0. Each subsequent enumerator with no
    = defines its enumeration constant as the value of the constant
    expression obtained by adding 1 to the value of the previous
    enumeration constant. (The use of enumerators with = may produce
    enumeration constants with values that duplicate other values in the
    same enumeration.)"

Please make sure that your changelogs are factual. Making uninformed
claims is not helping your cause.

The most important part is the WHY:

    Why is the current code suboptimal?

    Why is the proposed change making it better, more correct, less
    error prone?

If you can't come up with proper technical answers for these questions
then why should it be changed?

>  enum regnames {
> -	GDB_AX,			/* 0 */
> +	GDB_AX = 0,

Linear enums without value assignment like here are not a problem at
all. Simply because they are well defined and well understood. See the
above quote of the standard.

Whether the explicit assignment is an improvement over the trailing
comment or not is a matter of taste and preference. There is absolutely
_zero_ technical advantage in using explicit value assignments in _this_
case and neither in many other cases of your series.

Also completely removing the comments here loses information:

> -	GDB_PC,			/* 8 also known as eip */
> -	GDB_PS,			/* 9 also known as eflags */

Can you map _PC to EIP and _PS to EFLAGS? I can't without digging
deep...

>  static const char *const mtrr_strings[MTRR_NUM_TYPES] =
>  {
> -	"uncachable",		/* 0 */
> -	"write-combining",	/* 1 */
> -	"?",			/* 2 */
> -	"?",			/* 3 */
> -	"write-through",	/* 4 */
> -	"write-protect",	/* 5 */
> -	"write-back",		/* 6 */
> +	[0] = "uncachable",
> +	[1] = "write-combining",
> +	[2] = "?",
> +	[3] = "?",
> +	[4] = "write-through",
> +	[5] = "write-protect",
> +	[6] = "write-back",

Again, while not supported in C89, the kernel uses designators in array
initializers for a very long time...

Linear array initializers like the mtrr strings are not a real problem
simply because there is no correlation and the code using the array
still has to make sure that the index into the array is what it expects
to be the content. Changing it from C89 automatic to explicit C99
designators does not help there at all.

It becomes a different story if you combine [enum] constants and arrays
and use the constants in code because then the change to the constants
will immediately be reflected in the array initializer. I.e. for this
case:

enum foo {
     BAR,
     BAZ,
     RAB,
     ZAR,
};

char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
};

it makes a difference if someone does:

  enum foo {
     BAR,
     BAZ,
+    MOO,
     RAB,
     ZAR,
  };

because then the related array initializer is obviously out of
order. With:

char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
};

the existing values are still in the same place, just the newly added
value is a NULL pointer. It also does not matter when the fixup for the
missing array entry becomes:

  char *foobar[] = {
     [BAR] = "bar",
     [BAZ] = "baz",
     [RAB] = "rab",
     [ZAR] = "zar",
+    [MOO] = "moo",     
  };

because the compiled result is still in enum order. While doing

  char foobar[] = {
     "bar",
     "baz",
     "rab",
     "zar",
+    "moo",
  };

would be blantantly wrong. See?

But that does not apply to any of your proposed changes.

So you really need to look at things and not just throw a mechanical
change scheme at it, which results even in failures like reported by
the 0-day robot against patch 10/22.

That said, I'm not completely opposed to those changes, but you really
have to come up with good reasons why they make sense aside of
cosmetical reasons.

Btw, the really important change regarding initializers between C89 and
C99 was the ability to initialize struct members explicitly.

In C89 the only way to initialize a struct was

   = { a, b, c, d }

which was way more error prone than the enum/array initializers. The
dangerous part or C89 struct initializers are changes to the struct
unless the change of the struct is actually triggering a type
mismatch.

But even that needs some serious inspection whether there is confusion
potential or not. The harmless example is a file local:

struct foo {
       unsigned int      id;
       unsigned int      flags;
};

and the C89 style initializer:

static struct foo[] {
       { ID_A, 0x01 },
       { ID_B, 0x02 },
       { ID_C, 0x01 },
};

which has a very low confusion potential simply because it's scope is
file local and well defined and unlikely to change.

A globally used structure is a different problem especially when it
becomes necessary to insert a new struct member in the middle instead of
appending it, changing the order, removing a member... That ends up in a
hard to diagnose disaster with C89 style unnamed initializers pretty
fast.

Ideally C89 style unnamed struct initializers should not be used at all,
but again it's a matter of common sense and justification whether it's
worth to change it just because.

Thanks,

        tglx

[PATCH 05/22] acpica: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 93 deletions(-)

diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index bcd3871079d7..d19868d2ea46 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
 /* Printable names of the ACPI object types */
 
 static const char *acpi_gbl_ns_type_names[] = {
-	/* 00 */ "Untyped",
-	/* 01 */ "Integer",
-	/* 02 */ "String",
-	/* 03 */ "Buffer",
-	/* 04 */ "Package",
-	/* 05 */ "FieldUnit",
-	/* 06 */ "Device",
-	/* 07 */ "Event",
-	/* 08 */ "Method",
-	/* 09 */ "Mutex",
-	/* 10 */ "Region",
-	/* 11 */ "Power",
-	/* 12 */ "Processor",
-	/* 13 */ "Thermal",
-	/* 14 */ "BufferField",
-	/* 15 */ "DdbHandle",
-	/* 16 */ "DebugObject",
-	/* 17 */ "RegionField",
-	/* 18 */ "BankField",
-	/* 19 */ "IndexField",
-	/* 20 */ "Reference",
-	/* 21 */ "Alias",
-	/* 22 */ "MethodAlias",
-	/* 23 */ "Notify",
-	/* 24 */ "AddrHandler",
-	/* 25 */ "ResourceDesc",
-	/* 26 */ "ResourceFld",
-	/* 27 */ "Scope",
-	/* 28 */ "Extra",
-	/* 29 */ "Data",
-	/* 30 */ "Invalid"
+	[0]  = "Untyped",
+	[1]  = "Integer",
+	[2]  = "String",
+	[3]  = "Buffer",
+	[4]  = "Package",
+	[5]  = "FieldUnit",
+	[6]  = "Device",
+	[7]  = "Event",
+	[8]  = "Method",
+	[9]  = "Mutex",
+	[10] = "Region",
+	[11] = "Power",
+	[12] = "Processor",
+	[13] = "Thermal",
+	[14] = "BufferField",
+	[15] = "DdbHandle",
+	[16] = "DebugObject",
+	[17] = "RegionField",
+	[18] = "BankField",
+	[19] = "IndexField",
+	[20] = "Reference",
+	[21] = "Alias",
+	[22] = "MethodAlias",
+	[23] = "Notify",
+	[24] = "AddrHandler",
+	[25] = "ResourceDesc",
+	[26] = "ResourceFld",
+	[27] = "Scope",
+	[28] = "Extra",
+	[29] = "Data",
+	[30] = "Invalid"
 };
 
 const char *acpi_ut_get_type_name(acpi_object_type type)
@@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
 /* Printable names of object descriptor types */
 
 static const char *acpi_gbl_desc_type_names[] = {
-	/* 00 */ "Not a Descriptor",
-	/* 01 */ "Cached Object",
-	/* 02 */ "State-Generic",
-	/* 03 */ "State-Update",
-	/* 04 */ "State-Package",
-	/* 05 */ "State-Control",
-	/* 06 */ "State-RootParseScope",
-	/* 07 */ "State-ParseScope",
-	/* 08 */ "State-WalkScope",
-	/* 09 */ "State-Result",
-	/* 10 */ "State-Notify",
-	/* 11 */ "State-Thread",
-	/* 12 */ "Tree Walk State",
-	/* 13 */ "Parse Tree Op",
-	/* 14 */ "Operand Object",
-	/* 15 */ "Namespace Node"
+	[0]  = "Not a Descriptor",
+	[1]  = "Cached Object",
+	[2]  = "State-Generic",
+	[3]  = "State-Update",
+	[4]  = "State-Package",
+	[5]  = "State-Control",
+	[6]  = "State-RootParseScope",
+	[7]  = "State-ParseScope",
+	[8]  = "State-WalkScope",
+	[9]  = "State-Result",
+	[10] = "State-Notify",
+	[11] = "State-Thread",
+	[12] = "Tree Walk State",
+	[13] = "Parse Tree Op",
+	[14] = "Operand Object",
+	[15] = "Namespace Node"
 };
 
 const char *acpi_ut_get_descriptor_name(void *object)
@@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
 /* Printable names of reference object sub-types */
 
 static const char *acpi_gbl_ref_class_names[] = {
-	/* 00 */ "Local",
-	/* 01 */ "Argument",
-	/* 02 */ "RefOf",
-	/* 03 */ "Index",
-	/* 04 */ "DdbHandle",
-	/* 05 */ "Named Object",
-	/* 06 */ "Debug"
+	[0] = "Local",
+	[1] = "Argument",
+	[2] = "RefOf",
+	[3] = "Index",
+	[4] = "DdbHandle",
+	[5] = "Named Object",
+	[6] = "Debug"
 };
 
 const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
@@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
 /* Names for Notify() values, used for debug output */
 
 static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
-	/* 00 */ "Bus Check",
-	/* 01 */ "Device Check",
-	/* 02 */ "Device Wake",
-	/* 03 */ "Eject Request",
-	/* 04 */ "Device Check Light",
-	/* 05 */ "Frequency Mismatch",
-	/* 06 */ "Bus Mode Mismatch",
-	/* 07 */ "Power Fault",
-	/* 08 */ "Capabilities Check",
-	/* 09 */ "Device PLD Check",
-	/* 0A */ "Reserved",
-	/* 0B */ "System Locality Update",
-								/* 0C */ "Reserved (was previously Shutdown Request)",
-								/* Reserved in ACPI 6.0 */
-	/* 0D */ "System Resource Affinity Update",
-								/* 0E */ "Heterogeneous Memory Attributes Update",
-								/* ACPI 6.2 */
-						/* 0F */ "Error Disconnect Recover"
-						/* ACPI 6.3 */
+	[0]  = "Bus Check",
+	[1]  = "Device Check",
+	[2]  = "Device Wake",
+	[3]  = "Eject Request",
+	[4]  = "Device Check Light",
+	[5]  = "Frequency Mismatch",
+	[6]  = "Bus Mode Mismatch",
+	[7]  = "Power Fault",
+	[8]  = "Capabilities Check",
+	[9]  = "Device PLD Check",
+	[10] = "Reserved",
+	[11] = "System Locality Update",
+	[12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
+	[13] = "System Resource Affinity Update",
+	[14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
+	[15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
 };
 
 static const char *acpi_gbl_device_notify[5] = {
@@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
  ******************************************************************************/
 
 static const char *acpi_gbl_argument_type[20] = {
-	/* 00 */ "Unknown ARGP",
-	/* 01 */ "ByteData",
-	/* 02 */ "ByteList",
-	/* 03 */ "CharList",
-	/* 04 */ "DataObject",
-	/* 05 */ "DataObjectList",
-	/* 06 */ "DWordData",
-	/* 07 */ "FieldList",
-	/* 08 */ "Name",
-	/* 09 */ "NameString",
-	/* 0A */ "ObjectList",
-	/* 0B */ "PackageLength",
-	/* 0C */ "SuperName",
-	/* 0D */ "Target",
-	/* 0E */ "TermArg",
-	/* 0F */ "TermList",
-	/* 10 */ "WordData",
-	/* 11 */ "QWordData",
-	/* 12 */ "SimpleName",
-	/* 13 */ "NameOrRef"
+	[0x00] = "Unknown ARGP",
+	[0x01] = "ByteData",
+	[0x02] = "ByteList",
+	[0x03] = "CharList",
+	[0x04] = "DataObject",
+	[0x05] = "DataObjectList",
+	[0x06] = "DWordData",
+	[0x07] = "FieldList",
+	[0x08] = "Name",
+	[0x09] = "NameString",
+	[0x0A] = "ObjectList",
+	[0x0B] = "PackageLength",
+	[0x0C] = "SuperName",
+	[0x0D] = "Target",
+	[0x0E] = "TermArg",
+	[0x0F] = "TermList",
+	[0x10] = "WordData",
+	[0x11] = "QWordData",
+	[0x12] = "SimpleName",
+	[0x13] = "NameOrRef"
 };
 
 const char *acpi_ut_get_argument_type_name(u32 arg_type)
-- 
2.35.1

[PATCH 05/22] acpica: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 93 deletions(-)

diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index bcd3871079d7..d19868d2ea46 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
 /* Printable names of the ACPI object types */
 
 static const char *acpi_gbl_ns_type_names[] = {
-	/* 00 */ "Untyped",
-	/* 01 */ "Integer",
-	/* 02 */ "String",
-	/* 03 */ "Buffer",
-	/* 04 */ "Package",
-	/* 05 */ "FieldUnit",
-	/* 06 */ "Device",
-	/* 07 */ "Event",
-	/* 08 */ "Method",
-	/* 09 */ "Mutex",
-	/* 10 */ "Region",
-	/* 11 */ "Power",
-	/* 12 */ "Processor",
-	/* 13 */ "Thermal",
-	/* 14 */ "BufferField",
-	/* 15 */ "DdbHandle",
-	/* 16 */ "DebugObject",
-	/* 17 */ "RegionField",
-	/* 18 */ "BankField",
-	/* 19 */ "IndexField",
-	/* 20 */ "Reference",
-	/* 21 */ "Alias",
-	/* 22 */ "MethodAlias",
-	/* 23 */ "Notify",
-	/* 24 */ "AddrHandler",
-	/* 25 */ "ResourceDesc",
-	/* 26 */ "ResourceFld",
-	/* 27 */ "Scope",
-	/* 28 */ "Extra",
-	/* 29 */ "Data",
-	/* 30 */ "Invalid"
+	[0]  = "Untyped",
+	[1]  = "Integer",
+	[2]  = "String",
+	[3]  = "Buffer",
+	[4]  = "Package",
+	[5]  = "FieldUnit",
+	[6]  = "Device",
+	[7]  = "Event",
+	[8]  = "Method",
+	[9]  = "Mutex",
+	[10] = "Region",
+	[11] = "Power",
+	[12] = "Processor",
+	[13] = "Thermal",
+	[14] = "BufferField",
+	[15] = "DdbHandle",
+	[16] = "DebugObject",
+	[17] = "RegionField",
+	[18] = "BankField",
+	[19] = "IndexField",
+	[20] = "Reference",
+	[21] = "Alias",
+	[22] = "MethodAlias",
+	[23] = "Notify",
+	[24] = "AddrHandler",
+	[25] = "ResourceDesc",
+	[26] = "ResourceFld",
+	[27] = "Scope",
+	[28] = "Extra",
+	[29] = "Data",
+	[30] = "Invalid"
 };
 
 const char *acpi_ut_get_type_name(acpi_object_type type)
@@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
 /* Printable names of object descriptor types */
 
 static const char *acpi_gbl_desc_type_names[] = {
-	/* 00 */ "Not a Descriptor",
-	/* 01 */ "Cached Object",
-	/* 02 */ "State-Generic",
-	/* 03 */ "State-Update",
-	/* 04 */ "State-Package",
-	/* 05 */ "State-Control",
-	/* 06 */ "State-RootParseScope",
-	/* 07 */ "State-ParseScope",
-	/* 08 */ "State-WalkScope",
-	/* 09 */ "State-Result",
-	/* 10 */ "State-Notify",
-	/* 11 */ "State-Thread",
-	/* 12 */ "Tree Walk State",
-	/* 13 */ "Parse Tree Op",
-	/* 14 */ "Operand Object",
-	/* 15 */ "Namespace Node"
+	[0]  = "Not a Descriptor",
+	[1]  = "Cached Object",
+	[2]  = "State-Generic",
+	[3]  = "State-Update",
+	[4]  = "State-Package",
+	[5]  = "State-Control",
+	[6]  = "State-RootParseScope",
+	[7]  = "State-ParseScope",
+	[8]  = "State-WalkScope",
+	[9]  = "State-Result",
+	[10] = "State-Notify",
+	[11] = "State-Thread",
+	[12] = "Tree Walk State",
+	[13] = "Parse Tree Op",
+	[14] = "Operand Object",
+	[15] = "Namespace Node"
 };
 
 const char *acpi_ut_get_descriptor_name(void *object)
@@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
 /* Printable names of reference object sub-types */
 
 static const char *acpi_gbl_ref_class_names[] = {
-	/* 00 */ "Local",
-	/* 01 */ "Argument",
-	/* 02 */ "RefOf",
-	/* 03 */ "Index",
-	/* 04 */ "DdbHandle",
-	/* 05 */ "Named Object",
-	/* 06 */ "Debug"
+	[0] = "Local",
+	[1] = "Argument",
+	[2] = "RefOf",
+	[3] = "Index",
+	[4] = "DdbHandle",
+	[5] = "Named Object",
+	[6] = "Debug"
 };
 
 const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
@@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
 /* Names for Notify() values, used for debug output */
 
 static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
-	/* 00 */ "Bus Check",
-	/* 01 */ "Device Check",
-	/* 02 */ "Device Wake",
-	/* 03 */ "Eject Request",
-	/* 04 */ "Device Check Light",
-	/* 05 */ "Frequency Mismatch",
-	/* 06 */ "Bus Mode Mismatch",
-	/* 07 */ "Power Fault",
-	/* 08 */ "Capabilities Check",
-	/* 09 */ "Device PLD Check",
-	/* 0A */ "Reserved",
-	/* 0B */ "System Locality Update",
-								/* 0C */ "Reserved (was previously Shutdown Request)",
-								/* Reserved in ACPI 6.0 */
-	/* 0D */ "System Resource Affinity Update",
-								/* 0E */ "Heterogeneous Memory Attributes Update",
-								/* ACPI 6.2 */
-						/* 0F */ "Error Disconnect Recover"
-						/* ACPI 6.3 */
+	[0]  = "Bus Check",
+	[1]  = "Device Check",
+	[2]  = "Device Wake",
+	[3]  = "Eject Request",
+	[4]  = "Device Check Light",
+	[5]  = "Frequency Mismatch",
+	[6]  = "Bus Mode Mismatch",
+	[7]  = "Power Fault",
+	[8]  = "Capabilities Check",
+	[9]  = "Device PLD Check",
+	[10] = "Reserved",
+	[11] = "System Locality Update",
+	[12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
+	[13] = "System Resource Affinity Update",
+	[14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
+	[15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
 };
 
 static const char *acpi_gbl_device_notify[5] = {
@@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
  ******************************************************************************/
 
 static const char *acpi_gbl_argument_type[20] = {
-	/* 00 */ "Unknown ARGP",
-	/* 01 */ "ByteData",
-	/* 02 */ "ByteList",
-	/* 03 */ "CharList",
-	/* 04 */ "DataObject",
-	/* 05 */ "DataObjectList",
-	/* 06 */ "DWordData",
-	/* 07 */ "FieldList",
-	/* 08 */ "Name",
-	/* 09 */ "NameString",
-	/* 0A */ "ObjectList",
-	/* 0B */ "PackageLength",
-	/* 0C */ "SuperName",
-	/* 0D */ "Target",
-	/* 0E */ "TermArg",
-	/* 0F */ "TermList",
-	/* 10 */ "WordData",
-	/* 11 */ "QWordData",
-	/* 12 */ "SimpleName",
-	/* 13 */ "NameOrRef"
+	[0x00] = "Unknown ARGP",
+	[0x01] = "ByteData",
+	[0x02] = "ByteList",
+	[0x03] = "CharList",
+	[0x04] = "DataObject",
+	[0x05] = "DataObjectList",
+	[0x06] = "DWordData",
+	[0x07] = "FieldList",
+	[0x08] = "Name",
+	[0x09] = "NameString",
+	[0x0A] = "ObjectList",
+	[0x0B] = "PackageLength",
+	[0x0C] = "SuperName",
+	[0x0D] = "Target",
+	[0x0E] = "TermArg",
+	[0x0F] = "TermList",
+	[0x10] = "WordData",
+	[0x11] = "QWordData",
+	[0x12] = "SimpleName",
+	[0x13] = "NameOrRef"
 };
 
 const char *acpi_ut_get_argument_type_name(u32 arg_type)
-- 
2.35.1

[PATCH 05/22] acpica: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 93 deletions(-)

diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index bcd3871079d7..d19868d2ea46 100644
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
 /* Printable names of the ACPI object types */
 
 static const char *acpi_gbl_ns_type_names[] = {
-	/* 00 */ "Untyped",
-	/* 01 */ "Integer",
-	/* 02 */ "String",
-	/* 03 */ "Buffer",
-	/* 04 */ "Package",
-	/* 05 */ "FieldUnit",
-	/* 06 */ "Device",
-	/* 07 */ "Event",
-	/* 08 */ "Method",
-	/* 09 */ "Mutex",
-	/* 10 */ "Region",
-	/* 11 */ "Power",
-	/* 12 */ "Processor",
-	/* 13 */ "Thermal",
-	/* 14 */ "BufferField",
-	/* 15 */ "DdbHandle",
-	/* 16 */ "DebugObject",
-	/* 17 */ "RegionField",
-	/* 18 */ "BankField",
-	/* 19 */ "IndexField",
-	/* 20 */ "Reference",
-	/* 21 */ "Alias",
-	/* 22 */ "MethodAlias",
-	/* 23 */ "Notify",
-	/* 24 */ "AddrHandler",
-	/* 25 */ "ResourceDesc",
-	/* 26 */ "ResourceFld",
-	/* 27 */ "Scope",
-	/* 28 */ "Extra",
-	/* 29 */ "Data",
-	/* 30 */ "Invalid"
+	[0]  = "Untyped",
+	[1]  = "Integer",
+	[2]  = "String",
+	[3]  = "Buffer",
+	[4]  = "Package",
+	[5]  = "FieldUnit",
+	[6]  = "Device",
+	[7]  = "Event",
+	[8]  = "Method",
+	[9]  = "Mutex",
+	[10] = "Region",
+	[11] = "Power",
+	[12] = "Processor",
+	[13] = "Thermal",
+	[14] = "BufferField",
+	[15] = "DdbHandle",
+	[16] = "DebugObject",
+	[17] = "RegionField",
+	[18] = "BankField",
+	[19] = "IndexField",
+	[20] = "Reference",
+	[21] = "Alias",
+	[22] = "MethodAlias",
+	[23] = "Notify",
+	[24] = "AddrHandler",
+	[25] = "ResourceDesc",
+	[26] = "ResourceFld",
+	[27] = "Scope",
+	[28] = "Extra",
+	[29] = "Data",
+	[30] = "Invalid"
 };
 
 const char *acpi_ut_get_type_name(acpi_object_type type)
@@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
 /* Printable names of object descriptor types */
 
 static const char *acpi_gbl_desc_type_names[] = {
-	/* 00 */ "Not a Descriptor",
-	/* 01 */ "Cached Object",
-	/* 02 */ "State-Generic",
-	/* 03 */ "State-Update",
-	/* 04 */ "State-Package",
-	/* 05 */ "State-Control",
-	/* 06 */ "State-RootParseScope",
-	/* 07 */ "State-ParseScope",
-	/* 08 */ "State-WalkScope",
-	/* 09 */ "State-Result",
-	/* 10 */ "State-Notify",
-	/* 11 */ "State-Thread",
-	/* 12 */ "Tree Walk State",
-	/* 13 */ "Parse Tree Op",
-	/* 14 */ "Operand Object",
-	/* 15 */ "Namespace Node"
+	[0]  = "Not a Descriptor",
+	[1]  = "Cached Object",
+	[2]  = "State-Generic",
+	[3]  = "State-Update",
+	[4]  = "State-Package",
+	[5]  = "State-Control",
+	[6]  = "State-RootParseScope",
+	[7]  = "State-ParseScope",
+	[8]  = "State-WalkScope",
+	[9]  = "State-Result",
+	[10] = "State-Notify",
+	[11] = "State-Thread",
+	[12] = "Tree Walk State",
+	[13] = "Parse Tree Op",
+	[14] = "Operand Object",
+	[15] = "Namespace Node"
 };
 
 const char *acpi_ut_get_descriptor_name(void *object)
@@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
 /* Printable names of reference object sub-types */
 
 static const char *acpi_gbl_ref_class_names[] = {
-	/* 00 */ "Local",
-	/* 01 */ "Argument",
-	/* 02 */ "RefOf",
-	/* 03 */ "Index",
-	/* 04 */ "DdbHandle",
-	/* 05 */ "Named Object",
-	/* 06 */ "Debug"
+	[0] = "Local",
+	[1] = "Argument",
+	[2] = "RefOf",
+	[3] = "Index",
+	[4] = "DdbHandle",
+	[5] = "Named Object",
+	[6] = "Debug"
 };
 
 const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
@@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
 /* Names for Notify() values, used for debug output */
 
 static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
-	/* 00 */ "Bus Check",
-	/* 01 */ "Device Check",
-	/* 02 */ "Device Wake",
-	/* 03 */ "Eject Request",
-	/* 04 */ "Device Check Light",
-	/* 05 */ "Frequency Mismatch",
-	/* 06 */ "Bus Mode Mismatch",
-	/* 07 */ "Power Fault",
-	/* 08 */ "Capabilities Check",
-	/* 09 */ "Device PLD Check",
-	/* 0A */ "Reserved",
-	/* 0B */ "System Locality Update",
-								/* 0C */ "Reserved (was previously Shutdown Request)",
-								/* Reserved in ACPI 6.0 */
-	/* 0D */ "System Resource Affinity Update",
-								/* 0E */ "Heterogeneous Memory Attributes Update",
-								/* ACPI 6.2 */
-						/* 0F */ "Error Disconnect Recover"
-						/* ACPI 6.3 */
+	[0]  = "Bus Check",
+	[1]  = "Device Check",
+	[2]  = "Device Wake",
+	[3]  = "Eject Request",
+	[4]  = "Device Check Light",
+	[5]  = "Frequency Mismatch",
+	[6]  = "Bus Mode Mismatch",
+	[7]  = "Power Fault",
+	[8]  = "Capabilities Check",
+	[9]  = "Device PLD Check",
+	[10] = "Reserved",
+	[11] = "System Locality Update",
+	[12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
+	[13] = "System Resource Affinity Update",
+	[14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
+	[15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
 };
 
 static const char *acpi_gbl_device_notify[5] = {
@@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
  ******************************************************************************/
 
 static const char *acpi_gbl_argument_type[20] = {
-	/* 00 */ "Unknown ARGP",
-	/* 01 */ "ByteData",
-	/* 02 */ "ByteList",
-	/* 03 */ "CharList",
-	/* 04 */ "DataObject",
-	/* 05 */ "DataObjectList",
-	/* 06 */ "DWordData",
-	/* 07 */ "FieldList",
-	/* 08 */ "Name",
-	/* 09 */ "NameString",
-	/* 0A */ "ObjectList",
-	/* 0B */ "PackageLength",
-	/* 0C */ "SuperName",
-	/* 0D */ "Target",
-	/* 0E */ "TermArg",
-	/* 0F */ "TermList",
-	/* 10 */ "WordData",
-	/* 11 */ "QWordData",
-	/* 12 */ "SimpleName",
-	/* 13 */ "NameOrRef"
+	[0x00] = "Unknown ARGP",
+	[0x01] = "ByteData",
+	[0x02] = "ByteList",
+	[0x03] = "CharList",
+	[0x04] = "DataObject",
+	[0x05] = "DataObjectList",
+	[0x06] = "DWordData",
+	[0x07] = "FieldList",
+	[0x08] = "Name",
+	[0x09] = "NameString",
+	[0x0A] = "ObjectList",
+	[0x0B] = "PackageLength",
+	[0x0C] = "SuperName",
+	[0x0D] = "Target",
+	[0x0E] = "TermArg",
+	[0x0F] = "TermList",
+	[0x10] = "WordData",
+	[0x11] = "QWordData",
+	[0x12] = "SimpleName",
+	[0x13] = "NameOrRef"
 };
 
 const char *acpi_ut_get_argument_type_name(u32 arg_type)
-- 
2.35.1

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Andy Shevchenko]

On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Does it follow the conventions which are accepted in the ACPI CA project?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Andy Shevchenko]

On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Does it follow the conventions which are accepted in the ACPI CA project?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Andy Shevchenko]

On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Does it follow the conventions which are accepted in the ACPI CA project?

-- 
With Best Regards,
Andy Shevchenko

RE: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Moore, Robert]

-----Original Message-----
From: Andy Shevchenko <andy.shevchenko@gmail.com> 
Sent: Sunday, March 27, 2022 1:00 PM
To: Benjamin Stürz <benni@stuerz.xyz>
Cc: Andrew Lunn <andrew@lunn.ch>; Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>; Gregory Clement <gregory.clement@bootlin.com>; Russell King - ARM Linux <linux@armlinux.org.uk>; linux@simtec.co.uk; Krzysztof Kozlowski <krzk@kernel.org>; Alim Akhtar <alim.akhtar@samsung.com>; Thomas Gleixner <tglx@linutronix.de>; Ingo Molnar <mingo@redhat.com>; Borislav Petkov <bp@alien8.de>; Dave Hansen <dave.hansen@linux.intel.com>; H. Peter Anvin <hpa@zytor.com>; Moore, Robert <robert.moore@intel.com>; Wysocki, Rafael J <rafael.j.wysocki@intel.com>; Len Brown <lenb@kernel.org>; 3chas3@gmail.com; Harald Welte <laforge@gnumonks.org>; Arnd Bergmann <arnd@arndb.de>; Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Mauro Carvalho Chehab <mchehab@kernel.org>; Luck, Tony <tony.luck@intel.com>; James Morse <james.morse@arm.com>; Robert Richter <rric@kernel.org>; Linus Walleij <linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>; mike.marciniszyn@cornelisnetworks.com; dennis.dalessandro@cornelisnetworks.com; Jason Gunthorpe <jgg@ziepe.ca>; Pali Rohár <pali@kernel.org>; Dmitry Torokhov <dmitry.torokhov@gmail.com>; Karsten Keil <isdn@linux-pingi.de>; Benjamin Herrenschmidt <benh@kernel.crashing.org>; Frederic Barrat <fbarrat@linux.ibm.com>; Andrew Donnellan <ajd@linux.ibm.com>; David S. Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Nicolas Pitre <nico@fluxnic.net>; Loic Poulain <loic.poulain@linaro.org>; Kalle Valo <kvalo@kernel.org>; Ping-Ke Shih <pkshih@realtek.com>; Bjorn Helgaas <bhelgaas@google.com>; linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Samsung SOC <linux-samsung-soc@vger.kernel.org>; linux-ia64@vger.kernel.org; ACPI Devel Maling List <linux-acpi@vger.kernel.org>; open list:ACPI COMPONENT ARCHITECTURE (ACPICA) <devel@acpica.org>; linux-atm-general@lists.sourceforge.net; netdev <netdev@vger.kernel.org>; linux-edac@vger.kernel.org; open list:GPIO SUBSYSTEM <linux-gpio@vger.kernel.org>; open list:HFI1 DRIVER <linux-rdma@vger.kernel.org>; linux-input <linux-input@vger.kernel.org>; open list:LINUX FOR POWERPC PA SEMI PWRFICIENT <linuxppc-dev@lists.ozlabs.org>; linux-media@vger.kernel.org; wcn36xx@lists.infradead.org; linux-wireless@vger.kernel.org; linux-pci@vger.kernel.org
Subject: Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated initializers because the 
> kernel supports them now.

Does it follow the conventions which are accepted in the ACPI CA project?

No, it doesn't. ACPICA must work with many compilers, some of which are rather old. So, we don't support these initializers.
Bob

--
With Best Regards,
Andy Shevchenko

RE: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Moore, Robert]

-----Original Message-----
From: Andy Shevchenko <andy.shevchenko@gmail.com> 
Sent: Sunday, March 27, 2022 1:00 PM
To: Benjamin Stürz <benni@stuerz.xyz>
Cc: Andrew Lunn <andrew@lunn.ch>; Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>; Gregory Clement <gregory.clement@bootlin.com>; Russell King - ARM Linux <linux@armlinux.org.uk>; linux@simtec.co.uk; Krzysztof Kozlowski <krzk@kernel.org>; Alim Akhtar <alim.akhtar@samsung.com>; Thomas Gleixner <tglx@linutronix.de>; Ingo Molnar <mingo@redhat.com>; Borislav Petkov <bp@alien8.de>; Dave Hansen <dave.hansen@linux.intel.com>; H. Peter Anvin <hpa@zytor.com>; Moore, Robert <robert.moore@intel.com>; Wysocki, Rafael J <rafael.j.wysocki@intel.com>; Len Brown <lenb@kernel.org>; 3chas3@gmail.com; Harald Welte <laforge@gnumonks.org>; Arnd Bergmann <arnd@arndb.de>; Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Mauro Carvalho Chehab <mchehab@kernel.org>; Luck, Tony <tony.luck@intel.com>; James Morse <james.morse@arm.com>; Robert Richter <rric@kernel.org>; Linus Walleij <linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>; mike.marciniszyn@cornelisnetworks.com; dennis.dalessandro@cornelisnetworks.com; Jason Gunthorpe <jgg@ziepe.ca>; Pali Rohár <pali@kernel.org>; Dmitry Torokhov <dmitry.torokhov@gmail.com>; Karsten Keil <isdn@linux-pingi.de>; Benjamin Herrenschmidt <benh@kernel.crashing.org>; Frederic Barrat <fbarrat@linux.ibm.com>; Andrew Donnellan <ajd@linux.ibm.com>; David S. Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Nicolas Pitre <nico@fluxnic.net>; Loic Poulain <loic.poulain@linaro.org>; Kalle Valo <kvalo@kernel.org>; Ping-Ke Shih <pkshih@realtek.com>; Bjorn Helgaas <bhelgaas@google.com>; linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Samsung SOC <linux-samsung-soc@vger.kernel.org>; linux-ia64@vger.kernel.org; ACPI Devel Maling List <linux-acpi@vger.kernel.org>; open list:ACPI COMPONENT ARCHITECTURE (ACPICA) <devel@acpica.org>; linux-atm-general@lists.sourceforge.net; netdev <netdev@vger.kernel.org>; linux-edac@vger.kernel.org; open list:GPIO SUBSYSTEM <linux-gpio@vger.kernel.org>; open list:HFI1 DRIVER <linux-rdma@vger.kernel.org>; linux-input <linux-input@vger.kernel.org>; open list:LINUX FOR POWERPC PA SEMI PWRFICIENT <linuxppc-dev@lists.ozlabs.org>; linux-media@vger.kernel.org; wcn36xx@lists.infradead.org; linux-wireless@vger.kernel.org; linux-pci@vger.kernel.org
Subject: Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated initializers because the 
> kernel supports them now.

Does it follow the conventions which are accepted in the ACPI CA project?

No, it doesn't. ACPICA must work with many compilers, some of which are rather old. So, we don't support these initializers.
Bob

--
With Best Regards,
Andy Shevchenko

RE: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Moore, Robert]

DQoNCi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQpGcm9tOiBBbmR5IFNoZXZjaGVua28gPGFu
ZHkuc2hldmNoZW5rb0BnbWFpbC5jb20+IA0KU2VudDogU3VuZGF5LCBNYXJjaCAyNywgMjAyMiAx
OjAwIFBNDQpUbzogQmVuamFtaW4gU3TDvHJ6IDxiZW5uaUBzdHVlcnoueHl6Pg0KQ2M6IEFuZHJl
dyBMdW5uIDxhbmRyZXdAbHVubi5jaD47IFNlYmFzdGlhbiBIZXNzZWxiYXJ0aCA8c2ViYXN0aWFu
Lmhlc3NlbGJhcnRoQGdtYWlsLmNvbT47IEdyZWdvcnkgQ2xlbWVudCA8Z3JlZ29yeS5jbGVtZW50
QGJvb3RsaW4uY29tPjsgUnVzc2VsbCBLaW5nIC0gQVJNIExpbnV4IDxsaW51eEBhcm1saW51eC5v
cmcudWs+OyBsaW51eEBzaW10ZWMuY28udWs7IEtyenlzenRvZiBLb3psb3dza2kgPGtyemtAa2Vy
bmVsLm9yZz47IEFsaW0gQWtodGFyIDxhbGltLmFraHRhckBzYW1zdW5nLmNvbT47IFRob21hcyBH
bGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPjsgSW5nbyBNb2xuYXIgPG1pbmdvQHJlZGhhdC5j
b20+OyBCb3Jpc2xhdiBQZXRrb3YgPGJwQGFsaWVuOC5kZT47IERhdmUgSGFuc2VuIDxkYXZlLmhh
bnNlbkBsaW51eC5pbnRlbC5jb20+OyBILiBQZXRlciBBbnZpbiA8aHBhQHp5dG9yLmNvbT47IE1v
b3JlLCBSb2JlcnQgPHJvYmVydC5tb29yZUBpbnRlbC5jb20+OyBXeXNvY2tpLCBSYWZhZWwgSiA8
cmFmYWVsLmoud3lzb2NraUBpbnRlbC5jb20+OyBMZW4gQnJvd24gPGxlbmJAa2VybmVsLm9yZz47
IDNjaGFzM0BnbWFpbC5jb207IEhhcmFsZCBXZWx0ZSA8bGFmb3JnZUBnbnVtb25rcy5vcmc+OyBB
cm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPjsgR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hA
bGludXhmb3VuZGF0aW9uLm9yZz47IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNoZWhhYkBrZXJu
ZWwub3JnPjsgTHVjaywgVG9ueSA8dG9ueS5sdWNrQGludGVsLmNvbT47IEphbWVzIE1vcnNlIDxq
YW1lcy5tb3JzZUBhcm0uY29tPjsgUm9iZXJ0IFJpY2h0ZXIgPHJyaWNAa2VybmVsLm9yZz47IExp
bnVzIFdhbGxlaWogPGxpbnVzLndhbGxlaWpAbGluYXJvLm9yZz47IEJhcnRvc3ogR29sYXN6ZXdz
a2kgPGJyZ2xAYmdkZXYucGw+OyBtaWtlLm1hcmNpbmlzenluQGNvcm5lbGlzbmV0d29ya3MuY29t
OyBkZW5uaXMuZGFsZXNzYW5kcm9AY29ybmVsaXNuZXR3b3Jrcy5jb207IEphc29uIEd1bnRob3Jw
ZSA8amdnQHppZXBlLmNhPjsgUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz47IERtaXRyeSBU
b3Jva2hvdiA8ZG1pdHJ5LnRvcm9raG92QGdtYWlsLmNvbT47IEthcnN0ZW4gS2VpbCA8aXNkbkBs
aW51eC1waW5naS5kZT47IEJlbmphbWluIEhlcnJlbnNjaG1pZHQgPGJlbmhAa2VybmVsLmNyYXNo
aW5nLm9yZz47IEZyZWRlcmljIEJhcnJhdCA8ZmJhcnJhdEBsaW51eC5pYm0uY29tPjsgQW5kcmV3
IERvbm5lbGxhbiA8YWpkQGxpbnV4LmlibS5jb20+OyBEYXZpZCBTLiBNaWxsZXIgPGRhdmVtQGRh
dmVtbG9mdC5uZXQ+OyBKYWt1YiBLaWNpbnNraSA8a3ViYUBrZXJuZWwub3JnPjsgUGFvbG8gQWJl
bmkgPHBhYmVuaUByZWRoYXQuY29tPjsgTmljb2xhcyBQaXRyZSA8bmljb0BmbHV4bmljLm5ldD47
IExvaWMgUG91bGFpbiA8bG9pYy5wb3VsYWluQGxpbmFyby5vcmc+OyBLYWxsZSBWYWxvIDxrdmFs
b0BrZXJuZWwub3JnPjsgUGluZy1LZSBTaGloIDxwa3NoaWhAcmVhbHRlay5jb20+OyBCam9ybiBI
ZWxnYWFzIDxiaGVsZ2Fhc0Bnb29nbGUuY29tPjsgbGludXgtYXJtIE1haWxpbmcgTGlzdCA8bGlu
dXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnPjsgTGludXggS2VybmVsIE1haWxpbmcg
TGlzdCA8bGludXgta2VybmVsQHZnZXIua2VybmVsLm9yZz47IExpbnV4IFNhbXN1bmcgU09DIDxs
aW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtlcm5lbC5vcmc+OyBsaW51eC1pYTY0QHZnZXIua2VybmVs
Lm9yZzsgQUNQSSBEZXZlbCBNYWxpbmcgTGlzdCA8bGludXgtYWNwaUB2Z2VyLmtlcm5lbC5vcmc+
OyBvcGVuIGxpc3Q6QUNQSSBDT01QT05FTlQgQVJDSElURUNUVVJFIChBQ1BJQ0EpIDxkZXZlbEBh
Y3BpY2Eub3JnPjsgbGludXgtYXRtLWdlbmVyYWxAbGlzdHMuc291cmNlZm9yZ2UubmV0OyBuZXRk
ZXYgPG5ldGRldkB2Z2VyLmtlcm5lbC5vcmc+OyBsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZzsg
b3BlbiBsaXN0OkdQSU8gU1VCU1lTVEVNIDxsaW51eC1ncGlvQHZnZXIua2VybmVsLm9yZz47IG9w
ZW4gbGlzdDpIRkkxIERSSVZFUiA8bGludXgtcmRtYUB2Z2VyLmtlcm5lbC5vcmc+OyBsaW51eC1p
bnB1dCA8bGludXgtaW5wdXRAdmdlci5rZXJuZWwub3JnPjsgb3BlbiBsaXN0OkxJTlVYIEZPUiBQ
T1dFUlBDIFBBIFNFTUkgUFdSRklDSUVOVCA8bGludXhwcGMtZGV2QGxpc3RzLm96bGFicy5vcmc+
OyBsaW51eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmc7IHdjbjM2eHhAbGlzdHMuaW5mcmFkZWFkLm9y
ZzsgbGludXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnOyBsaW51eC1wY2lAdmdlci5rZXJuZWwu
b3JnDQpTdWJqZWN0OiBSZTogW1BBVENIIDA1LzIyXSBhY3BpY2E6IFJlcGxhY2UgY29tbWVudHMg
d2l0aCBDOTkgaW5pdGlhbGl6ZXJzDQoNCk9uIFNhdCwgTWFyIDI2LCAyMDIyIGF0IDc6MzkgUE0g
QmVuamFtaW4gU3TDvHJ6IDxiZW5uaUBzdHVlcnoueHl6PiB3cm90ZToNCj4NCj4gVGhpcyByZXBs
YWNlcyBjb21tZW50cyB3aXRoIEM5OSdzIGRlc2lnbmF0ZWQgaW5pdGlhbGl6ZXJzIGJlY2F1c2Ug
dGhlIA0KPiBrZXJuZWwgc3VwcG9ydHMgdGhlbSBub3cuDQoNCkRvZXMgaXQgZm9sbG93IHRoZSBj
b252ZW50aW9ucyB3aGljaCBhcmUgYWNjZXB0ZWQgaW4gdGhlIEFDUEkgQ0EgcHJvamVjdD8NCg0K
Tm8sIGl0IGRvZXNuJ3QuIEFDUElDQSBtdXN0IHdvcmsgd2l0aCBtYW55IGNvbXBpbGVycywgc29t
ZSBvZiB3aGljaCBhcmUgcmF0aGVyIG9sZC4gU28sIHdlIGRvbid0IHN1cHBvcnQgdGhlc2UgaW5p
dGlhbGl6ZXJzLg0KQm9iDQoNCi0tDQpXaXRoIEJlc3QgUmVnYXJkcywNCkFuZHkgU2hldmNoZW5r
bw0K

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

Please fix your mailer.  This mail is completely unreadable.

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

Please fix your mailer.  This mail is completely unreadable.

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

Please fix your mailer.  This mail is completely unreadable.

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

On Sun, Mar 27, 2022 at 10:59:54PM +0300, Andy Shevchenko wrote:
> On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> Does it follow the conventions which are accepted in the ACPI CA project?

Why would ACPI CA be allowed to make up it's own conventions?  And as
you might imply not allow using a very useful and more than 20 year old
C feature?  This kind of BS need to stop.

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

On Sun, Mar 27, 2022 at 10:59:54PM +0300, Andy Shevchenko wrote:
> On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> Does it follow the conventions which are accepted in the ACPI CA project?

Why would ACPI CA be allowed to make up it's own conventions?  And as
you might imply not allow using a very useful and more than 20 year old
C feature?  This kind of BS need to stop.

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Christoph Hellwig]

On Sun, Mar 27, 2022 at 10:59:54PM +0300, Andy Shevchenko wrote:
> On Sat, Mar 26, 2022 at 7:39 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> Does it follow the conventions which are accepted in the ACPI CA project?

Why would ACPI CA be allowed to make up it's own conventions?  And as
you might imply not allow using a very useful and more than 20 year old
C feature?  This kind of BS need to stop.

[PATCH 06/22] idt77252: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/atm/idt77252_tables.h | 512 +++++++++++++++++-----------------
 1 file changed, 256 insertions(+), 256 deletions(-)

diff --git a/drivers/atm/idt77252_tables.h b/drivers/atm/idt77252_tables.h
index 12b81e046a7b..8067ac7e2d5c 100644
--- a/drivers/atm/idt77252_tables.h
+++ b/drivers/atm/idt77252_tables.h
@@ -6,262 +6,262 @@
 
 static unsigned int log_to_rate[] =
 {
-/* 000 */ 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
-/* 001 */ 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
-/* 002 */ 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
-/* 003 */ 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
-/* 004 */ 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
-/* 005 */ 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
-/* 006 */ 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
-/* 007 */ 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
-/* 008 */ 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
-/* 009 */ 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
-/* 010 */ 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
-/* 011 */ 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
-/* 012 */ 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
-/* 013 */ 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
-/* 014 */ 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
-/* 015 */ 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
-/* 016 */ 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
-/* 017 */ 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
-/* 018 */ 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
-/* 019 */ 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
-/* 020 */ 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
-/* 021 */ 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
-/* 022 */ 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
-/* 023 */ 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
-/* 024 */ 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
-/* 025 */ 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
-/* 026 */ 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
-/* 027 */ 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
-/* 028 */ 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
-/* 029 */ 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
-/* 030 */ 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
-/* 031 */ 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
-/* 032 */ 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
-/* 033 */ 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
-/* 034 */ 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
-/* 035 */ 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
-/* 036 */ 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
-/* 037 */ 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
-/* 038 */ 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
-/* 039 */ 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
-/* 040 */ 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
-/* 041 */ 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
-/* 042 */ 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
-/* 043 */ 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
-/* 044 */ 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
-/* 045 */ 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
-/* 046 */ 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
-/* 047 */ 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
-/* 048 */ 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
-/* 049 */ 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
-/* 050 */ 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
-/* 051 */ 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
-/* 052 */ 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
-/* 053 */ 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
-/* 054 */ 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
-/* 055 */ 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
-/* 056 */ 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
-/* 057 */ 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
-/* 058 */ 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
-/* 059 */ 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
-/* 060 */ 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
-/* 061 */ 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
-/* 062 */ 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
-/* 063 */ 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
-/* 064 */ 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
-/* 065 */ 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
-/* 066 */ 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
-/* 067 */ 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
-/* 068 */ 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
-/* 069 */ 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
-/* 070 */ 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
-/* 071 */ 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
-/* 072 */ 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
-/* 073 */ 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
-/* 074 */ 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
-/* 075 */ 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
-/* 076 */ 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
-/* 077 */ 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
-/* 078 */ 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
-/* 079 */ 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
-/* 080 */ 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
-/* 081 */ 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
-/* 082 */ 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
-/* 083 */ 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
-/* 084 */ 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
-/* 085 */ 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
-/* 086 */ 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
-/* 087 */ 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
-/* 088 */ 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
-/* 089 */ 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
-/* 090 */ 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
-/* 091 */ 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
-/* 092 */ 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
-/* 093 */ 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
-/* 094 */ 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
-/* 095 */ 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
-/* 096 */ 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
-/* 097 */ 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
-/* 098 */ 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
-/* 099 */ 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
-/* 100 */ 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
-/* 101 */ 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
-/* 102 */ 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
-/* 103 */ 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
-/* 104 */ 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
-/* 105 */ 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
-/* 106 */ 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
-/* 107 */ 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
-/* 108 */ 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
-/* 109 */ 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
-/* 110 */ 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
-/* 111 */ 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
-/* 112 */ 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
-/* 113 */ 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
-/* 114 */ 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
-/* 115 */ 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
-/* 116 */ 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
-/* 117 */ 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
-/* 118 */ 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
-/* 119 */ 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
-/* 120 */ 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
-/* 121 */ 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
-/* 122 */ 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
-/* 123 */ 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
-/* 124 */ 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
-/* 125 */ 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
-/* 126 */ 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
-/* 127 */ 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
-/* 128 */ 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
-/* 129 */ 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
-/* 130 */ 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
-/* 131 */ 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
-/* 132 */ 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
-/* 133 */ 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
-/* 134 */ 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
-/* 135 */ 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
-/* 136 */ 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
-/* 137 */ 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
-/* 138 */ 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
-/* 139 */ 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
-/* 140 */ 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
-/* 141 */ 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
-/* 142 */ 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
-/* 143 */ 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
-/* 144 */ 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
-/* 145 */ 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
-/* 146 */ 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
-/* 147 */ 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
-/* 148 */ 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
-/* 149 */ 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
-/* 150 */ 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
-/* 151 */ 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
-/* 152 */ 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
-/* 153 */ 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
-/* 154 */ 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
-/* 155 */ 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
-/* 156 */ 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
-/* 157 */ 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
-/* 158 */ 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
-/* 159 */ 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
-/* 160 */ 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
-/* 161 */ 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
-/* 162 */ 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
-/* 163 */ 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
-/* 164 */ 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
-/* 165 */ 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
-/* 166 */ 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
-/* 167 */ 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
-/* 168 */ 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
-/* 169 */ 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
-/* 170 */ 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
-/* 171 */ 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
-/* 172 */ 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
-/* 173 */ 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
-/* 174 */ 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
-/* 175 */ 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
-/* 176 */ 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
-/* 177 */ 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
-/* 178 */ 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
-/* 179 */ 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
-/* 180 */ 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
-/* 181 */ 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
-/* 182 */ 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
-/* 183 */ 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
-/* 184 */ 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
-/* 185 */ 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
-/* 186 */ 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
-/* 187 */ 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
-/* 188 */ 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
-/* 189 */ 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
-/* 190 */ 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
-/* 191 */ 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
-/* 192 */ 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
-/* 193 */ 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
-/* 194 */ 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
-/* 195 */ 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
-/* 196 */ 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
-/* 197 */ 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
-/* 198 */ 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
-/* 199 */ 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
-/* 200 */ 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
-/* 201 */ 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
-/* 202 */ 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
-/* 203 */ 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
-/* 204 */ 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
-/* 205 */ 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
-/* 206 */ 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
-/* 207 */ 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
-/* 208 */ 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
-/* 209 */ 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
-/* 210 */ 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
-/* 211 */ 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
-/* 212 */ 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
-/* 213 */ 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
-/* 214 */ 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
-/* 215 */ 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
-/* 216 */ 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
-/* 217 */ 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
-/* 218 */ 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
-/* 219 */ 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
-/* 220 */ 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
-/* 221 */ 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
-/* 222 */ 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
-/* 223 */ 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
-/* 224 */ 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
-/* 225 */ 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
-/* 226 */ 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
-/* 227 */ 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
-/* 228 */ 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
-/* 229 */ 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
-/* 230 */ 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
-/* 231 */ 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
-/* 232 */ 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
-/* 233 */ 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
-/* 234 */ 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
-/* 235 */ 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
-/* 236 */ 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
-/* 237 */ 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
-/* 238 */ 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
-/* 239 */ 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
-/* 240 */ 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
-/* 241 */ 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
-/* 242 */ 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
-/* 243 */ 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
-/* 244 */ 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
-/* 245 */ 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
-/* 246 */ 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
-/* 247 */ 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
-/* 248 */ 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
-/* 249 */ 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
-/* 250 */ 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
-/* 251 */ 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
-/* 252 */ 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
-/* 253 */ 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
-/* 254 */ 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
-/* 255 */ 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
+	[0]   = 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
+	[1]   = 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
+	[2]   = 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
+	[3]   = 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
+	[4]   = 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
+	[5]   = 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
+	[6]   = 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
+	[7]   = 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
+	[8]   = 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
+	[9]   = 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
+	[10]  = 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
+	[11]  = 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
+	[12]  = 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
+	[13]  = 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
+	[14]  = 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
+	[15]  = 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
+	[16]  = 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
+	[17]  = 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
+	[18]  = 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
+	[19]  = 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
+	[20]  = 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
+	[21]  = 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
+	[22]  = 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
+	[23]  = 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
+	[24]  = 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
+	[25]  = 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
+	[26]  = 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
+	[27]  = 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
+	[28]  = 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
+	[29]  = 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
+	[30]  = 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
+	[31]  = 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
+	[32]  = 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
+	[33]  = 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
+	[34]  = 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
+	[35]  = 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
+	[36]  = 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
+	[37]  = 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
+	[38]  = 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
+	[39]  = 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
+	[40]  = 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
+	[41]  = 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
+	[42]  = 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
+	[43]  = 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
+	[44]  = 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
+	[45]  = 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
+	[46]  = 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
+	[47]  = 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
+	[48]  = 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
+	[49]  = 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
+	[50]  = 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
+	[51]  = 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
+	[52]  = 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
+	[53]  = 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
+	[54]  = 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
+	[55]  = 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
+	[56]  = 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
+	[57]  = 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
+	[58]  = 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
+	[59]  = 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
+	[60]  = 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
+	[61]  = 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
+	[62]  = 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
+	[63]  = 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
+	[64]  = 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
+	[65]  = 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
+	[66]  = 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
+	[67]  = 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
+	[68]  = 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
+	[69]  = 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
+	[70]  = 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
+	[71]  = 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
+	[72]  = 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
+	[73]  = 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
+	[74]  = 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
+	[75]  = 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
+	[76]  = 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
+	[77]  = 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
+	[78]  = 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
+	[79]  = 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
+	[80]  = 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
+	[81]  = 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
+	[82]  = 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
+	[83]  = 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
+	[84]  = 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
+	[85]  = 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
+	[86]  = 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
+	[87]  = 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
+	[88]  = 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
+	[89]  = 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
+	[90]  = 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
+	[91]  = 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
+	[92]  = 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
+	[93]  = 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
+	[94]  = 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
+	[95]  = 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
+	[96]  = 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
+	[97]  = 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
+	[98]  = 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
+	[99]  = 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
+	[100] = 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
+	[101] = 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
+	[102] = 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
+	[103] = 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
+	[104] = 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
+	[105] = 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
+	[106] = 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
+	[107] = 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
+	[108] = 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
+	[109] = 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
+	[110] = 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
+	[111] = 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
+	[112] = 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
+	[113] = 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
+	[114] = 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
+	[115] = 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
+	[116] = 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
+	[117] = 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
+	[118] = 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
+	[119] = 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
+	[120] = 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
+	[121] = 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
+	[122] = 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
+	[123] = 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
+	[124] = 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
+	[125] = 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
+	[126] = 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
+	[127] = 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
+	[128] = 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
+	[129] = 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
+	[130] = 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
+	[131] = 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
+	[132] = 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
+	[133] = 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
+	[134] = 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
+	[135] = 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
+	[136] = 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
+	[137] = 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
+	[138] = 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
+	[139] = 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
+	[140] = 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
+	[141] = 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
+	[142] = 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
+	[143] = 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
+	[144] = 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
+	[145] = 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
+	[146] = 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
+	[147] = 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
+	[148] = 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
+	[149] = 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
+	[150] = 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
+	[151] = 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
+	[152] = 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
+	[153] = 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
+	[154] = 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
+	[155] = 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
+	[156] = 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
+	[157] = 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
+	[158] = 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
+	[159] = 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
+	[160] = 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
+	[161] = 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
+	[162] = 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
+	[163] = 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
+	[164] = 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
+	[165] = 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
+	[166] = 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
+	[167] = 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
+	[168] = 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
+	[169] = 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
+	[170] = 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
+	[171] = 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
+	[172] = 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
+	[173] = 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
+	[174] = 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
+	[175] = 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
+	[176] = 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
+	[177] = 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
+	[178] = 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
+	[179] = 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
+	[180] = 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
+	[181] = 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
+	[182] = 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
+	[183] = 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
+	[184] = 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
+	[185] = 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
+	[186] = 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
+	[187] = 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
+	[188] = 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
+	[189] = 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
+	[190] = 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
+	[191] = 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
+	[192] = 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
+	[193] = 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
+	[194] = 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
+	[195] = 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
+	[196] = 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
+	[197] = 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
+	[198] = 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
+	[199] = 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
+	[200] = 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
+	[201] = 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
+	[202] = 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
+	[203] = 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
+	[204] = 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
+	[205] = 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
+	[206] = 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
+	[207] = 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
+	[208] = 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
+	[209] = 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
+	[210] = 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
+	[211] = 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
+	[212] = 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
+	[213] = 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
+	[214] = 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
+	[215] = 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
+	[216] = 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
+	[217] = 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
+	[218] = 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
+	[219] = 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
+	[220] = 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
+	[221] = 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
+	[222] = 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
+	[223] = 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
+	[224] = 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
+	[225] = 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
+	[226] = 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
+	[227] = 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
+	[228] = 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
+	[229] = 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
+	[230] = 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
+	[231] = 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
+	[232] = 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
+	[233] = 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
+	[234] = 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
+	[235] = 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
+	[236] = 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
+	[237] = 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
+	[238] = 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
+	[239] = 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
+	[240] = 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
+	[241] = 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
+	[242] = 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
+	[243] = 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
+	[244] = 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
+	[245] = 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
+	[246] = 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
+	[247] = 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
+	[248] = 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
+	[249] = 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
+	[250] = 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
+	[251] = 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
+	[252] = 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
+	[253] = 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
+	[254] = 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
+	[255] = 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
 };
 
 static unsigned char rate_to_log[] =
-- 
2.35.1

[PATCH 06/22] idt77252: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/atm/idt77252_tables.h | 512 +++++++++++++++++-----------------
 1 file changed, 256 insertions(+), 256 deletions(-)

diff --git a/drivers/atm/idt77252_tables.h b/drivers/atm/idt77252_tables.h
index 12b81e046a7b..8067ac7e2d5c 100644
--- a/drivers/atm/idt77252_tables.h
+++ b/drivers/atm/idt77252_tables.h
@@ -6,262 +6,262 @@
 
 static unsigned int log_to_rate[] =
 {
-/* 000 */ 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
-/* 001 */ 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
-/* 002 */ 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
-/* 003 */ 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
-/* 004 */ 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
-/* 005 */ 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
-/* 006 */ 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
-/* 007 */ 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
-/* 008 */ 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
-/* 009 */ 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
-/* 010 */ 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
-/* 011 */ 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
-/* 012 */ 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
-/* 013 */ 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
-/* 014 */ 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
-/* 015 */ 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
-/* 016 */ 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
-/* 017 */ 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
-/* 018 */ 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
-/* 019 */ 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
-/* 020 */ 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
-/* 021 */ 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
-/* 022 */ 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
-/* 023 */ 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
-/* 024 */ 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
-/* 025 */ 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
-/* 026 */ 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
-/* 027 */ 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
-/* 028 */ 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
-/* 029 */ 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
-/* 030 */ 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
-/* 031 */ 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
-/* 032 */ 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
-/* 033 */ 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
-/* 034 */ 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
-/* 035 */ 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
-/* 036 */ 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
-/* 037 */ 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
-/* 038 */ 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
-/* 039 */ 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
-/* 040 */ 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
-/* 041 */ 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
-/* 042 */ 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
-/* 043 */ 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
-/* 044 */ 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
-/* 045 */ 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
-/* 046 */ 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
-/* 047 */ 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
-/* 048 */ 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
-/* 049 */ 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
-/* 050 */ 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
-/* 051 */ 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
-/* 052 */ 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
-/* 053 */ 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
-/* 054 */ 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
-/* 055 */ 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
-/* 056 */ 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
-/* 057 */ 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
-/* 058 */ 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
-/* 059 */ 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
-/* 060 */ 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
-/* 061 */ 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
-/* 062 */ 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
-/* 063 */ 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
-/* 064 */ 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
-/* 065 */ 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
-/* 066 */ 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
-/* 067 */ 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
-/* 068 */ 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
-/* 069 */ 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
-/* 070 */ 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
-/* 071 */ 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
-/* 072 */ 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
-/* 073 */ 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
-/* 074 */ 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
-/* 075 */ 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
-/* 076 */ 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
-/* 077 */ 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
-/* 078 */ 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
-/* 079 */ 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
-/* 080 */ 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
-/* 081 */ 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
-/* 082 */ 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
-/* 083 */ 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
-/* 084 */ 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
-/* 085 */ 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
-/* 086 */ 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
-/* 087 */ 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
-/* 088 */ 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
-/* 089 */ 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
-/* 090 */ 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
-/* 091 */ 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
-/* 092 */ 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
-/* 093 */ 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
-/* 094 */ 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
-/* 095 */ 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
-/* 096 */ 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
-/* 097 */ 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
-/* 098 */ 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
-/* 099 */ 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
-/* 100 */ 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
-/* 101 */ 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
-/* 102 */ 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
-/* 103 */ 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
-/* 104 */ 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
-/* 105 */ 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
-/* 106 */ 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
-/* 107 */ 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
-/* 108 */ 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
-/* 109 */ 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
-/* 110 */ 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
-/* 111 */ 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
-/* 112 */ 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
-/* 113 */ 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
-/* 114 */ 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
-/* 115 */ 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
-/* 116 */ 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
-/* 117 */ 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
-/* 118 */ 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
-/* 119 */ 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
-/* 120 */ 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
-/* 121 */ 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
-/* 122 */ 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
-/* 123 */ 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
-/* 124 */ 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
-/* 125 */ 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
-/* 126 */ 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
-/* 127 */ 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
-/* 128 */ 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
-/* 129 */ 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
-/* 130 */ 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
-/* 131 */ 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
-/* 132 */ 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
-/* 133 */ 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
-/* 134 */ 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
-/* 135 */ 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
-/* 136 */ 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
-/* 137 */ 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
-/* 138 */ 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
-/* 139 */ 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
-/* 140 */ 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
-/* 141 */ 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
-/* 142 */ 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
-/* 143 */ 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
-/* 144 */ 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
-/* 145 */ 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
-/* 146 */ 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
-/* 147 */ 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
-/* 148 */ 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
-/* 149 */ 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
-/* 150 */ 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
-/* 151 */ 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
-/* 152 */ 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
-/* 153 */ 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
-/* 154 */ 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
-/* 155 */ 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
-/* 156 */ 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
-/* 157 */ 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
-/* 158 */ 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
-/* 159 */ 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
-/* 160 */ 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
-/* 161 */ 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
-/* 162 */ 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
-/* 163 */ 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
-/* 164 */ 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
-/* 165 */ 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
-/* 166 */ 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
-/* 167 */ 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
-/* 168 */ 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
-/* 169 */ 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
-/* 170 */ 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
-/* 171 */ 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
-/* 172 */ 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
-/* 173 */ 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
-/* 174 */ 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
-/* 175 */ 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
-/* 176 */ 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
-/* 177 */ 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
-/* 178 */ 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
-/* 179 */ 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
-/* 180 */ 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
-/* 181 */ 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
-/* 182 */ 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
-/* 183 */ 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
-/* 184 */ 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
-/* 185 */ 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
-/* 186 */ 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
-/* 187 */ 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
-/* 188 */ 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
-/* 189 */ 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
-/* 190 */ 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
-/* 191 */ 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
-/* 192 */ 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
-/* 193 */ 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
-/* 194 */ 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
-/* 195 */ 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
-/* 196 */ 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
-/* 197 */ 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
-/* 198 */ 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
-/* 199 */ 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
-/* 200 */ 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
-/* 201 */ 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
-/* 202 */ 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
-/* 203 */ 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
-/* 204 */ 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
-/* 205 */ 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
-/* 206 */ 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
-/* 207 */ 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
-/* 208 */ 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
-/* 209 */ 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
-/* 210 */ 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
-/* 211 */ 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
-/* 212 */ 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
-/* 213 */ 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
-/* 214 */ 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
-/* 215 */ 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
-/* 216 */ 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
-/* 217 */ 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
-/* 218 */ 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
-/* 219 */ 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
-/* 220 */ 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
-/* 221 */ 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
-/* 222 */ 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
-/* 223 */ 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
-/* 224 */ 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
-/* 225 */ 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
-/* 226 */ 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
-/* 227 */ 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
-/* 228 */ 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
-/* 229 */ 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
-/* 230 */ 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
-/* 231 */ 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
-/* 232 */ 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
-/* 233 */ 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
-/* 234 */ 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
-/* 235 */ 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
-/* 236 */ 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
-/* 237 */ 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
-/* 238 */ 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
-/* 239 */ 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
-/* 240 */ 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
-/* 241 */ 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
-/* 242 */ 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
-/* 243 */ 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
-/* 244 */ 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
-/* 245 */ 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
-/* 246 */ 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
-/* 247 */ 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
-/* 248 */ 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
-/* 249 */ 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
-/* 250 */ 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
-/* 251 */ 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
-/* 252 */ 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
-/* 253 */ 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
-/* 254 */ 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
-/* 255 */ 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
+	[0]   = 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
+	[1]   = 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
+	[2]   = 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
+	[3]   = 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
+	[4]   = 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
+	[5]   = 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
+	[6]   = 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
+	[7]   = 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
+	[8]   = 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
+	[9]   = 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
+	[10]  = 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
+	[11]  = 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
+	[12]  = 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
+	[13]  = 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
+	[14]  = 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
+	[15]  = 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
+	[16]  = 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
+	[17]  = 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
+	[18]  = 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
+	[19]  = 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
+	[20]  = 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
+	[21]  = 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
+	[22]  = 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
+	[23]  = 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
+	[24]  = 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
+	[25]  = 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
+	[26]  = 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
+	[27]  = 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
+	[28]  = 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
+	[29]  = 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
+	[30]  = 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
+	[31]  = 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
+	[32]  = 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
+	[33]  = 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
+	[34]  = 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
+	[35]  = 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
+	[36]  = 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
+	[37]  = 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
+	[38]  = 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
+	[39]  = 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
+	[40]  = 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
+	[41]  = 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
+	[42]  = 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
+	[43]  = 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
+	[44]  = 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
+	[45]  = 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
+	[46]  = 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
+	[47]  = 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
+	[48]  = 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
+	[49]  = 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
+	[50]  = 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
+	[51]  = 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
+	[52]  = 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
+	[53]  = 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
+	[54]  = 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
+	[55]  = 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
+	[56]  = 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
+	[57]  = 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
+	[58]  = 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
+	[59]  = 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
+	[60]  = 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
+	[61]  = 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
+	[62]  = 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
+	[63]  = 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
+	[64]  = 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
+	[65]  = 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
+	[66]  = 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
+	[67]  = 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
+	[68]  = 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
+	[69]  = 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
+	[70]  = 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
+	[71]  = 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
+	[72]  = 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
+	[73]  = 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
+	[74]  = 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
+	[75]  = 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
+	[76]  = 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
+	[77]  = 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
+	[78]  = 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
+	[79]  = 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
+	[80]  = 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
+	[81]  = 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
+	[82]  = 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
+	[83]  = 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
+	[84]  = 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
+	[85]  = 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
+	[86]  = 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
+	[87]  = 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
+	[88]  = 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
+	[89]  = 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
+	[90]  = 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
+	[91]  = 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
+	[92]  = 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
+	[93]  = 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
+	[94]  = 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
+	[95]  = 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
+	[96]  = 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
+	[97]  = 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
+	[98]  = 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
+	[99]  = 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
+	[100] = 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
+	[101] = 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
+	[102] = 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
+	[103] = 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
+	[104] = 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
+	[105] = 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
+	[106] = 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
+	[107] = 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
+	[108] = 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
+	[109] = 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
+	[110] = 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
+	[111] = 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
+	[112] = 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
+	[113] = 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
+	[114] = 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
+	[115] = 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
+	[116] = 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
+	[117] = 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
+	[118] = 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
+	[119] = 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
+	[120] = 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
+	[121] = 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
+	[122] = 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
+	[123] = 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
+	[124] = 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
+	[125] = 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
+	[126] = 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
+	[127] = 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
+	[128] = 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
+	[129] = 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
+	[130] = 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
+	[131] = 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
+	[132] = 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
+	[133] = 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
+	[134] = 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
+	[135] = 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
+	[136] = 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
+	[137] = 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
+	[138] = 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
+	[139] = 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
+	[140] = 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
+	[141] = 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
+	[142] = 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
+	[143] = 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
+	[144] = 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
+	[145] = 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
+	[146] = 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
+	[147] = 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
+	[148] = 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
+	[149] = 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
+	[150] = 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
+	[151] = 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
+	[152] = 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
+	[153] = 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
+	[154] = 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
+	[155] = 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
+	[156] = 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
+	[157] = 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
+	[158] = 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
+	[159] = 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
+	[160] = 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
+	[161] = 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
+	[162] = 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
+	[163] = 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
+	[164] = 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
+	[165] = 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
+	[166] = 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
+	[167] = 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
+	[168] = 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
+	[169] = 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
+	[170] = 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
+	[171] = 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
+	[172] = 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
+	[173] = 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
+	[174] = 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
+	[175] = 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
+	[176] = 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
+	[177] = 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
+	[178] = 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
+	[179] = 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
+	[180] = 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
+	[181] = 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
+	[182] = 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
+	[183] = 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
+	[184] = 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
+	[185] = 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
+	[186] = 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
+	[187] = 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
+	[188] = 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
+	[189] = 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
+	[190] = 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
+	[191] = 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
+	[192] = 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
+	[193] = 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
+	[194] = 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
+	[195] = 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
+	[196] = 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
+	[197] = 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
+	[198] = 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
+	[199] = 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
+	[200] = 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
+	[201] = 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
+	[202] = 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
+	[203] = 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
+	[204] = 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
+	[205] = 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
+	[206] = 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
+	[207] = 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
+	[208] = 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
+	[209] = 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
+	[210] = 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
+	[211] = 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
+	[212] = 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
+	[213] = 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
+	[214] = 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
+	[215] = 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
+	[216] = 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
+	[217] = 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
+	[218] = 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
+	[219] = 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
+	[220] = 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
+	[221] = 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
+	[222] = 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
+	[223] = 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
+	[224] = 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
+	[225] = 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
+	[226] = 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
+	[227] = 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
+	[228] = 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
+	[229] = 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
+	[230] = 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
+	[231] = 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
+	[232] = 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
+	[233] = 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
+	[234] = 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
+	[235] = 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
+	[236] = 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
+	[237] = 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
+	[238] = 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
+	[239] = 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
+	[240] = 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
+	[241] = 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
+	[242] = 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
+	[243] = 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
+	[244] = 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
+	[245] = 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
+	[246] = 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
+	[247] = 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
+	[248] = 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
+	[249] = 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
+	[250] = 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
+	[251] = 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
+	[252] = 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
+	[253] = 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
+	[254] = 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
+	[255] = 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
 };
 
 static unsigned char rate_to_log[] =
-- 
2.35.1

[PATCH 06/22] idt77252: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/atm/idt77252_tables.h | 512 +++++++++++++++++-----------------
 1 file changed, 256 insertions(+), 256 deletions(-)

diff --git a/drivers/atm/idt77252_tables.h b/drivers/atm/idt77252_tables.h
index 12b81e046a7b..8067ac7e2d5c 100644
--- a/drivers/atm/idt77252_tables.h
+++ b/drivers/atm/idt77252_tables.h
@@ -6,262 +6,262 @@
 
 static unsigned int log_to_rate[]  {
-/* 000 */ 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
-/* 001 */ 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
-/* 002 */ 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
-/* 003 */ 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
-/* 004 */ 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
-/* 005 */ 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
-/* 006 */ 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
-/* 007 */ 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
-/* 008 */ 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
-/* 009 */ 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
-/* 010 */ 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
-/* 011 */ 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
-/* 012 */ 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
-/* 013 */ 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
-/* 014 */ 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
-/* 015 */ 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
-/* 016 */ 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
-/* 017 */ 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
-/* 018 */ 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
-/* 019 */ 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
-/* 020 */ 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
-/* 021 */ 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
-/* 022 */ 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
-/* 023 */ 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
-/* 024 */ 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
-/* 025 */ 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
-/* 026 */ 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
-/* 027 */ 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
-/* 028 */ 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
-/* 029 */ 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
-/* 030 */ 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
-/* 031 */ 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
-/* 032 */ 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
-/* 033 */ 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
-/* 034 */ 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
-/* 035 */ 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
-/* 036 */ 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
-/* 037 */ 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
-/* 038 */ 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
-/* 039 */ 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
-/* 040 */ 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
-/* 041 */ 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
-/* 042 */ 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
-/* 043 */ 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
-/* 044 */ 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
-/* 045 */ 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
-/* 046 */ 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
-/* 047 */ 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
-/* 048 */ 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
-/* 049 */ 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
-/* 050 */ 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
-/* 051 */ 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
-/* 052 */ 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
-/* 053 */ 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
-/* 054 */ 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
-/* 055 */ 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
-/* 056 */ 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
-/* 057 */ 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
-/* 058 */ 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
-/* 059 */ 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
-/* 060 */ 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
-/* 061 */ 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
-/* 062 */ 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
-/* 063 */ 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
-/* 064 */ 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
-/* 065 */ 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
-/* 066 */ 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
-/* 067 */ 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
-/* 068 */ 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
-/* 069 */ 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
-/* 070 */ 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
-/* 071 */ 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
-/* 072 */ 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
-/* 073 */ 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
-/* 074 */ 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
-/* 075 */ 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
-/* 076 */ 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
-/* 077 */ 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
-/* 078 */ 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
-/* 079 */ 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
-/* 080 */ 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
-/* 081 */ 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
-/* 082 */ 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
-/* 083 */ 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
-/* 084 */ 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
-/* 085 */ 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
-/* 086 */ 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
-/* 087 */ 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
-/* 088 */ 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
-/* 089 */ 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
-/* 090 */ 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
-/* 091 */ 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
-/* 092 */ 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
-/* 093 */ 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
-/* 094 */ 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
-/* 095 */ 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
-/* 096 */ 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
-/* 097 */ 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
-/* 098 */ 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
-/* 099 */ 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
-/* 100 */ 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
-/* 101 */ 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
-/* 102 */ 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
-/* 103 */ 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
-/* 104 */ 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
-/* 105 */ 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
-/* 106 */ 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
-/* 107 */ 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
-/* 108 */ 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
-/* 109 */ 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
-/* 110 */ 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
-/* 111 */ 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
-/* 112 */ 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
-/* 113 */ 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
-/* 114 */ 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
-/* 115 */ 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
-/* 116 */ 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
-/* 117 */ 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
-/* 118 */ 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
-/* 119 */ 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
-/* 120 */ 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
-/* 121 */ 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
-/* 122 */ 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
-/* 123 */ 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
-/* 124 */ 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
-/* 125 */ 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
-/* 126 */ 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
-/* 127 */ 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
-/* 128 */ 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
-/* 129 */ 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
-/* 130 */ 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
-/* 131 */ 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
-/* 132 */ 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
-/* 133 */ 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
-/* 134 */ 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
-/* 135 */ 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
-/* 136 */ 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
-/* 137 */ 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
-/* 138 */ 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
-/* 139 */ 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
-/* 140 */ 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
-/* 141 */ 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
-/* 142 */ 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
-/* 143 */ 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
-/* 144 */ 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
-/* 145 */ 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
-/* 146 */ 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
-/* 147 */ 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
-/* 148 */ 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
-/* 149 */ 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
-/* 150 */ 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
-/* 151 */ 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
-/* 152 */ 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
-/* 153 */ 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
-/* 154 */ 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
-/* 155 */ 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
-/* 156 */ 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
-/* 157 */ 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
-/* 158 */ 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
-/* 159 */ 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
-/* 160 */ 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
-/* 161 */ 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
-/* 162 */ 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
-/* 163 */ 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
-/* 164 */ 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
-/* 165 */ 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
-/* 166 */ 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
-/* 167 */ 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
-/* 168 */ 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
-/* 169 */ 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
-/* 170 */ 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
-/* 171 */ 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
-/* 172 */ 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
-/* 173 */ 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
-/* 174 */ 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
-/* 175 */ 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
-/* 176 */ 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
-/* 177 */ 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
-/* 178 */ 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
-/* 179 */ 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
-/* 180 */ 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
-/* 181 */ 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
-/* 182 */ 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
-/* 183 */ 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
-/* 184 */ 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
-/* 185 */ 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
-/* 186 */ 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
-/* 187 */ 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
-/* 188 */ 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
-/* 189 */ 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
-/* 190 */ 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
-/* 191 */ 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
-/* 192 */ 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
-/* 193 */ 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
-/* 194 */ 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
-/* 195 */ 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
-/* 196 */ 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
-/* 197 */ 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
-/* 198 */ 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
-/* 199 */ 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
-/* 200 */ 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
-/* 201 */ 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
-/* 202 */ 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
-/* 203 */ 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
-/* 204 */ 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
-/* 205 */ 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
-/* 206 */ 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
-/* 207 */ 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
-/* 208 */ 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
-/* 209 */ 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
-/* 210 */ 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
-/* 211 */ 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
-/* 212 */ 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
-/* 213 */ 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
-/* 214 */ 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
-/* 215 */ 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
-/* 216 */ 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
-/* 217 */ 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
-/* 218 */ 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
-/* 219 */ 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
-/* 220 */ 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
-/* 221 */ 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
-/* 222 */ 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
-/* 223 */ 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
-/* 224 */ 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
-/* 225 */ 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
-/* 226 */ 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
-/* 227 */ 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
-/* 228 */ 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
-/* 229 */ 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
-/* 230 */ 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
-/* 231 */ 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
-/* 232 */ 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
-/* 233 */ 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
-/* 234 */ 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
-/* 235 */ 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
-/* 236 */ 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
-/* 237 */ 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
-/* 238 */ 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
-/* 239 */ 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
-/* 240 */ 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
-/* 241 */ 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
-/* 242 */ 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
-/* 243 */ 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
-/* 244 */ 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
-/* 245 */ 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
-/* 246 */ 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
-/* 247 */ 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
-/* 248 */ 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
-/* 249 */ 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
-/* 250 */ 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
-/* 251 */ 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
-/* 252 */ 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
-/* 253 */ 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
-/* 254 */ 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
-/* 255 */ 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
+	[0]   = 0x8d022e27, /* cps =     10.02, nrm =  3, interval = 35264.00 */
+	[1]   = 0x8d362e11, /* cps =     10.42, nrm =  3, interval = 33856.00 */
+	[2]   = 0x8d6e2bf8, /* cps =     10.86, nrm =  3, interval = 32512.00 */
+	[3]   = 0x8da82bcf, /* cps =     11.31, nrm =  3, interval = 31200.00 */
+	[4]   = 0x8de42ba8, /* cps =     11.78, nrm =  3, interval = 29952.00 */
+	[5]   = 0x8e242b82, /* cps =     12.28, nrm =  3, interval = 28736.00 */
+	[6]   = 0x8e662b5e, /* cps =     12.80, nrm =  3, interval = 27584.00 */
+	[7]   = 0x8eaa2b3c, /* cps =     13.33, nrm =  3, interval = 26496.00 */
+	[8]   = 0x8ef22b1a, /* cps =     13.89, nrm =  3, interval = 25408.00 */
+	[9]   = 0x8f3e2afa, /* cps =     14.48, nrm =  3, interval = 24384.00 */
+	[10]  = 0x8f8a2adc, /* cps =     15.08, nrm =  3, interval = 23424.00 */
+	[11]  = 0x8fdc2abe, /* cps =     15.72, nrm =  3, interval = 22464.00 */
+	[12]  = 0x90182aa2, /* cps =     16.38, nrm =  3, interval = 21568.00 */
+	[13]  = 0x90422a87, /* cps =     17.03, nrm =  3, interval = 20704.00 */
+	[14]  = 0x90702a6d, /* cps =     17.75, nrm =  3, interval = 19872.00 */
+	[15]  = 0x90a02a54, /* cps =     18.50, nrm =  3, interval = 19072.00 */
+	[16]  = 0x90d22a3c, /* cps =     19.28, nrm =  3, interval = 18304.00 */
+	[17]  = 0x91062a25, /* cps =     20.09, nrm =  3, interval = 17568.00 */
+	[18]  = 0x913c2a0f, /* cps =     20.94, nrm =  3, interval = 16864.00 */
+	[19]  = 0x917427f3, /* cps =     21.81, nrm =  3, interval = 16176.00 */
+	[20]  = 0x91b027ca, /* cps =     22.75, nrm =  3, interval = 15520.00 */
+	[21]  = 0x91ec27a3, /* cps =     23.69, nrm =  3, interval = 14896.00 */
+	[22]  = 0x922c277e, /* cps =     24.69, nrm =  3, interval = 14304.00 */
+	[23]  = 0x926e275a, /* cps =     25.72, nrm =  3, interval = 13728.00 */
+	[24]  = 0x92b42737, /* cps =     26.81, nrm =  3, interval = 13168.00 */
+	[25]  = 0x92fc2716, /* cps =     27.94, nrm =  3, interval = 12640.00 */
+	[26]  = 0x934626f6, /* cps =     29.09, nrm =  3, interval = 12128.00 */
+	[27]  = 0x939426d8, /* cps =     30.31, nrm =  3, interval = 11648.00 */
+	[28]  = 0x93e426bb, /* cps =     31.56, nrm =  3, interval = 11184.00 */
+	[29]  = 0x941e269e, /* cps =     32.94, nrm =  3, interval = 10720.00 */
+	[30]  = 0x944a2683, /* cps =     34.31, nrm =  3, interval = 10288.00 */
+	[31]  = 0x9476266a, /* cps =     35.69, nrm =  3, interval =  9888.00 */
+	[32]  = 0x94a62651, /* cps =     37.19, nrm =  3, interval =  9488.00 */
+	[33]  = 0x94d82639, /* cps =     38.75, nrm =  3, interval =  9104.00 */
+	[34]  = 0x950c6622, /* cps =     40.38, nrm =  4, interval =  8736.00 */
+	[35]  = 0x9544660c, /* cps =     42.12, nrm =  4, interval =  8384.00 */
+	[36]  = 0x957c63ee, /* cps =     43.88, nrm =  4, interval =  8048.00 */
+	[37]  = 0x95b663c6, /* cps =     45.69, nrm =  4, interval =  7728.00 */
+	[38]  = 0x95f4639f, /* cps =     47.62, nrm =  4, interval =  7416.00 */
+	[39]  = 0x96346379, /* cps =     49.62, nrm =  4, interval =  7112.00 */
+	[40]  = 0x96766356, /* cps =     51.69, nrm =  4, interval =  6832.00 */
+	[41]  = 0x96bc6333, /* cps =     53.88, nrm =  4, interval =  6552.00 */
+	[42]  = 0x97046312, /* cps =     56.12, nrm =  4, interval =  6288.00 */
+	[43]  = 0x974e62f3, /* cps =     58.44, nrm =  4, interval =  6040.00 */
+	[44]  = 0x979e62d4, /* cps =     60.94, nrm =  4, interval =  5792.00 */
+	[45]  = 0x97f062b7, /* cps =     63.50, nrm =  4, interval =  5560.00 */
+	[46]  = 0x9822629b, /* cps =     66.12, nrm =  4, interval =  5336.00 */
+	[47]  = 0x984e6280, /* cps =     68.88, nrm =  4, interval =  5120.00 */
+	[48]  = 0x987e6266, /* cps =     71.88, nrm =  4, interval =  4912.00 */
+	[49]  = 0x98ac624e, /* cps =     74.75, nrm =  4, interval =  4720.00 */
+	[50]  = 0x98e06236, /* cps =     78.00, nrm =  4, interval =  4528.00 */
+	[51]  = 0x9914a21f, /* cps =     81.25, nrm =  8, interval =  4344.00 */
+	[52]  = 0x994aa209, /* cps =     84.62, nrm =  8, interval =  4168.00 */
+	[53]  = 0x99829fe9, /* cps =     88.12, nrm =  8, interval =  4004.00 */
+	[54]  = 0x99be9fc1, /* cps =     91.88, nrm =  8, interval =  3844.00 */
+	[55]  = 0x99fc9f9a, /* cps =     95.75, nrm =  8, interval =  3688.00 */
+	[56]  = 0x9a3c9f75, /* cps =     99.75, nrm =  8, interval =  3540.00 */
+	[57]  = 0x9a809f51, /* cps =    104.00, nrm =  8, interval =  3396.00 */
+	[58]  = 0x9ac49f2f, /* cps =    108.25, nrm =  8, interval =  3260.00 */
+	[59]  = 0x9b0e9f0e, /* cps =    112.88, nrm =  8, interval =  3128.00 */
+	[60]  = 0x9b589eef, /* cps =    117.50, nrm =  8, interval =  3004.00 */
+	[61]  = 0x9ba69ed1, /* cps =    122.38, nrm =  8, interval =  2884.00 */
+	[62]  = 0x9bf89eb4, /* cps =    127.50, nrm =  8, interval =  2768.00 */
+	[63]  = 0x9c269e98, /* cps =    132.75, nrm =  8, interval =  2656.00 */
+	[64]  = 0x9c549e7d, /* cps =    138.50, nrm =  8, interval =  2548.00 */
+	[65]  = 0x9c849e63, /* cps =    144.50, nrm =  8, interval =  2444.00 */
+	[66]  = 0x9cb29e4b, /* cps =    150.25, nrm =  8, interval =  2348.00 */
+	[67]  = 0x9ce69e33, /* cps =    156.75, nrm =  8, interval =  2252.00 */
+	[68]  = 0x9d1cde1c, /* cps =    163.50, nrm = 16, interval =  2160.00 */
+	[69]  = 0x9d50de07, /* cps =    170.00, nrm = 16, interval =  2076.00 */
+	[70]  = 0x9d8adbe4, /* cps =    177.25, nrm = 16, interval =  1992.00 */
+	[71]  = 0x9dc4dbbc, /* cps =    184.50, nrm = 16, interval =  1912.00 */
+	[72]  = 0x9e02db96, /* cps =    192.25, nrm = 16, interval =  1836.00 */
+	[73]  = 0x9e42db71, /* cps =    200.25, nrm = 16, interval =  1762.00 */
+	[74]  = 0x9e86db4d, /* cps =    208.75, nrm = 16, interval =  1690.00 */
+	[75]  = 0x9ecedb2b, /* cps =    217.75, nrm = 16, interval =  1622.00 */
+	[76]  = 0x9f16db0a, /* cps =    226.75, nrm = 16, interval =  1556.00 */
+	[77]  = 0x9f62daeb, /* cps =    236.25, nrm = 16, interval =  1494.00 */
+	[78]  = 0x9fb2dacd, /* cps =    246.25, nrm = 16, interval =  1434.00 */
+	[79]  = 0xa002dab0, /* cps =    256.50, nrm = 16, interval =  1376.00 */
+	[80]  = 0xa02eda94, /* cps =    267.50, nrm = 16, interval =  1320.00 */
+	[81]  = 0xa05ada7a, /* cps =    278.50, nrm = 16, interval =  1268.00 */
+	[82]  = 0xa088da60, /* cps =    290.00, nrm = 16, interval =  1216.00 */
+	[83]  = 0xa0b8da48, /* cps =    302.00, nrm = 16, interval =  1168.00 */
+	[84]  = 0xa0ecda30, /* cps =    315.00, nrm = 16, interval =  1120.00 */
+	[85]  = 0xa1211a1a, /* cps =    328.00, nrm = 32, interval =  1076.00 */
+	[86]  = 0xa1591a04, /* cps =    342.00, nrm = 32, interval =  1032.00 */
+	[87]  = 0xa19117df, /* cps =    356.00, nrm = 32, interval =   991.00 */
+	[88]  = 0xa1cd17b7, /* cps =    371.00, nrm = 32, interval =   951.00 */
+	[89]  = 0xa20b1791, /* cps =    386.50, nrm = 32, interval =   913.00 */
+	[90]  = 0xa24d176c, /* cps =    403.00, nrm = 32, interval =   876.00 */
+	[91]  = 0xa28f1749, /* cps =    419.50, nrm = 32, interval =   841.00 */
+	[92]  = 0xa2d71727, /* cps =    437.50, nrm = 32, interval =   807.00 */
+	[93]  = 0xa31f1707, /* cps =    455.50, nrm = 32, interval =   775.00 */
+	[94]  = 0xa36d16e7, /* cps =    475.00, nrm = 32, interval =   743.00 */
+	[95]  = 0xa3bd16c9, /* cps =    495.00, nrm = 32, interval =   713.00 */
+	[96]  = 0xa40716ad, /* cps =    515.00, nrm = 32, interval =   685.00 */
+	[97]  = 0xa4331691, /* cps =    537.00, nrm = 32, interval =   657.00 */
+	[98]  = 0xa45f1677, /* cps =    559.00, nrm = 32, interval =   631.00 */
+	[99]  = 0xa48f165d, /* cps =    583.00, nrm = 32, interval =   605.00 */
+	[100] = 0xa4bf1645, /* cps =    607.00, nrm = 32, interval =   581.00 */
+	[101] = 0xa4f1162e, /* cps =    632.00, nrm = 32, interval =   558.00 */
+	[102] = 0xa5291617, /* cps =    660.00, nrm = 32, interval =   535.00 */
+	[103] = 0xa55f1602, /* cps =    687.00, nrm = 32, interval =   514.00 */
+	[104] = 0xa59913da, /* cps =    716.00, nrm = 32, interval =   493.00 */
+	[105] = 0xa5d513b2, /* cps =    746.00, nrm = 32, interval =   473.00 */
+	[106] = 0xa613138c, /* cps =    777.00, nrm = 32, interval =   454.00 */
+	[107] = 0xa6551368, /* cps =    810.00, nrm = 32, interval =   436.00 */
+	[108] = 0xa6971345, /* cps =    843.00, nrm = 32, interval =   418.50 */
+	[109] = 0xa6df1323, /* cps =    879.00, nrm = 32, interval =   401.50 */
+	[110] = 0xa7291303, /* cps =    916.00, nrm = 32, interval =   385.50 */
+	[111] = 0xa77512e4, /* cps =    954.00, nrm = 32, interval =   370.00 */
+	[112] = 0xa7c512c6, /* cps =    994.00, nrm = 32, interval =   355.00 */
+	[113] = 0xa80d12a9, /* cps =   1036.00, nrm = 32, interval =   340.50 */
+	[114] = 0xa839128e, /* cps =   1080.00, nrm = 32, interval =   327.00 */
+	[115] = 0xa8651274, /* cps =   1124.00, nrm = 32, interval =   314.00 */
+	[116] = 0xa895125a, /* cps =   1172.00, nrm = 32, interval =   301.00 */
+	[117] = 0xa8c71242, /* cps =   1222.00, nrm = 32, interval =   289.00 */
+	[118] = 0xa8f9122b, /* cps =   1272.00, nrm = 32, interval =   277.50 */
+	[119] = 0xa92f1214, /* cps =   1326.00, nrm = 32, interval =   266.00 */
+	[120] = 0xa9670ffe, /* cps =   1382.00, nrm = 32, interval =   255.50 */
+	[121] = 0xa9a10fd5, /* cps =   1440.00, nrm = 32, interval =   245.25 */
+	[122] = 0xa9db0fae, /* cps =   1498.00, nrm = 32, interval =   235.50 */
+	[123] = 0xaa1b0f88, /* cps =   1562.00, nrm = 32, interval =   226.00 */
+	[124] = 0xaa5d0f63, /* cps =   1628.00, nrm = 32, interval =   216.75 */
+	[125] = 0xaaa10f41, /* cps =   1696.00, nrm = 32, interval =   208.25 */
+	[126] = 0xaae90f1f, /* cps =   1768.00, nrm = 32, interval =   199.75 */
+	[127] = 0xab330eff, /* cps =   1842.00, nrm = 32, interval =   191.75 */
+	[128] = 0xab7f0ee0, /* cps =   1918.00, nrm = 32, interval =   184.00 */
+	[129] = 0xabd10ec2, /* cps =   2000.00, nrm = 32, interval =   176.50 */
+	[130] = 0xac110ea6, /* cps =   2080.00, nrm = 32, interval =   169.50 */
+	[131] = 0xac3d0e8b, /* cps =   2168.00, nrm = 32, interval =   162.75 */
+	[132] = 0xac6d0e70, /* cps =   2264.00, nrm = 32, interval =   156.00 */
+	[133] = 0xac9b0e57, /* cps =   2356.00, nrm = 32, interval =   149.75 */
+	[134] = 0xaccd0e3f, /* cps =   2456.00, nrm = 32, interval =   143.75 */
+	[135] = 0xacff0e28, /* cps =   2556.00, nrm = 32, interval =   138.00 */
+	[136] = 0xad350e12, /* cps =   2664.00, nrm = 32, interval =   132.50 */
+	[137] = 0xad6d0bf9, /* cps =   2776.00, nrm = 32, interval =   127.12 */
+	[138] = 0xada70bd0, /* cps =   2892.00, nrm = 32, interval =   122.00 */
+	[139] = 0xade30ba9, /* cps =   3012.00, nrm = 32, interval =   117.12 */
+	[140] = 0xae230b83, /* cps =   3140.00, nrm = 32, interval =   112.38 */
+	[141] = 0xae650b5f, /* cps =   3272.00, nrm = 32, interval =   107.88 */
+	[142] = 0xaeab0b3c, /* cps =   3412.00, nrm = 32, interval =   103.50 */
+	[143] = 0xaef10b1b, /* cps =   3552.00, nrm = 32, interval =    99.38 */
+	[144] = 0xaf3b0afb, /* cps =   3700.00, nrm = 32, interval =    95.38 */
+	[145] = 0xaf8b0adc, /* cps =   3860.00, nrm = 32, interval =    91.50 */
+	[146] = 0xafd90abf, /* cps =   4016.00, nrm = 32, interval =    87.88 */
+	[147] = 0xb0170aa3, /* cps =   4184.00, nrm = 32, interval =    84.38 */
+	[148] = 0xb0430a87, /* cps =   4360.00, nrm = 32, interval =    80.88 */
+	[149] = 0xb0710a6d, /* cps =   4544.00, nrm = 32, interval =    77.62 */
+	[150] = 0xb0a10a54, /* cps =   4736.00, nrm = 32, interval =    74.50 */
+	[151] = 0xb0d30a3c, /* cps =   4936.00, nrm = 32, interval =    71.50 */
+	[152] = 0xb1070a25, /* cps =   5144.00, nrm = 32, interval =    68.62 */
+	[153] = 0xb13d0a0f, /* cps =   5360.00, nrm = 32, interval =    65.88 */
+	[154] = 0xb17507f4, /* cps =   5584.00, nrm = 32, interval =    63.25 */
+	[155] = 0xb1af07cb, /* cps =   5816.00, nrm = 32, interval =    60.69 */
+	[156] = 0xb1eb07a4, /* cps =   6056.00, nrm = 32, interval =    58.25 */
+	[157] = 0xb22b077f, /* cps =   6312.00, nrm = 32, interval =    55.94 */
+	[158] = 0xb26d075b, /* cps =   6576.00, nrm = 32, interval =    53.69 */
+	[159] = 0xb2b30738, /* cps =   6856.00, nrm = 32, interval =    51.50 */
+	[160] = 0xb2fb0717, /* cps =   7144.00, nrm = 32, interval =    49.44 */
+	[161] = 0xb34506f7, /* cps =   7440.00, nrm = 32, interval =    47.44 */
+	[162] = 0xb39306d9, /* cps =   7752.00, nrm = 32, interval =    45.56 */
+	[163] = 0xb3e506bb, /* cps =   8080.00, nrm = 32, interval =    43.69 */
+	[164] = 0xb41d069f, /* cps =   8416.00, nrm = 32, interval =    41.94 */
+	[165] = 0xb4490684, /* cps =   8768.00, nrm = 32, interval =    40.25 */
+	[166] = 0xb477066a, /* cps =   9136.00, nrm = 32, interval =    38.62 */
+	[167] = 0xb4a70651, /* cps =   9520.00, nrm = 32, interval =    37.06 */
+	[168] = 0xb4d90639, /* cps =   9920.00, nrm = 32, interval =    35.56 */
+	[169] = 0xb50d0622, /* cps =  10336.00, nrm = 32, interval =    34.12 */
+	[170] = 0xb545060c, /* cps =  10784.00, nrm = 32, interval =    32.75 */
+	[171] = 0xb57b03ef, /* cps =  11216.00, nrm = 32, interval =    31.47 */
+	[172] = 0xb5b503c7, /* cps =  11680.00, nrm = 32, interval =    30.22 */
+	[173] = 0xb5f303a0, /* cps =  12176.00, nrm = 32, interval =    29.00 */
+	[174] = 0xb633037a, /* cps =  12688.00, nrm = 32, interval =    27.81 */
+	[175] = 0xb6750357, /* cps =  13216.00, nrm = 32, interval =    26.72 */
+	[176] = 0xb6bb0334, /* cps =  13776.00, nrm = 32, interval =    25.62 */
+	[177] = 0xb7030313, /* cps =  14352.00, nrm = 32, interval =    24.59 */
+	[178] = 0xb74f02f3, /* cps =  14960.00, nrm = 32, interval =    23.59 */
+	[179] = 0xb79d02d5, /* cps =  15584.00, nrm = 32, interval =    22.66 */
+	[180] = 0xb7ed02b8, /* cps =  16224.00, nrm = 32, interval =    21.75 */
+	[181] = 0xb821029c, /* cps =  16896.00, nrm = 32, interval =    20.88 */
+	[182] = 0xb84f0281, /* cps =  17632.00, nrm = 32, interval =    20.03 */
+	[183] = 0xb87d0267, /* cps =  18368.00, nrm = 32, interval =    19.22 */
+	[184] = 0xb8ad024e, /* cps =  19136.00, nrm = 32, interval =    18.44 */
+	[185] = 0xb8dd0237, /* cps =  19904.00, nrm = 32, interval =    17.72 */
+	[186] = 0xb9130220, /* cps =  20768.00, nrm = 32, interval =    17.00 */
+	[187] = 0xb949020a, /* cps =  21632.00, nrm = 32, interval =    16.31 */
+	[188] = 0xb98301f5, /* cps =  22560.00, nrm = 32, interval =    15.66 */
+	[189] = 0xb9bd01e1, /* cps =  23488.00, nrm = 32, interval =    15.03 */
+	[190] = 0xb9fd01cd, /* cps =  24512.00, nrm = 32, interval =    14.41 */
+	[191] = 0xba3b01bb, /* cps =  25504.00, nrm = 32, interval =    13.84 */
+	[192] = 0xba7f01a9, /* cps =  26592.00, nrm = 32, interval =    13.28 */
+	[193] = 0xbac30198, /* cps =  27680.00, nrm = 32, interval =    12.75 */
+	[194] = 0xbb0f0187, /* cps =  28896.00, nrm = 32, interval =    12.22 */
+	[195] = 0xbb570178, /* cps =  30048.00, nrm = 32, interval =    11.75 */
+	[196] = 0xbbab0168, /* cps =  31392.00, nrm = 32, interval =    11.25 */
+	[197] = 0xbbf9015a, /* cps =  32640.00, nrm = 32, interval =    10.81 */
+	[198] = 0xbc27014c, /* cps =  33984.00, nrm = 32, interval =    10.38 */
+	[199] = 0xbc53013f, /* cps =  35392.00, nrm = 32, interval =     9.97 */
+	[200] = 0xbc830132, /* cps =  36928.00, nrm = 32, interval =     9.56 */
+	[201] = 0xbcb50125, /* cps =  38528.00, nrm = 32, interval =     9.16 */
+	[202] = 0xbce5011a, /* cps =  40064.00, nrm = 32, interval =     8.81 */
+	[203] = 0xbd1d010e, /* cps =  41856.00, nrm = 32, interval =     8.44 */
+	[204] = 0xbd530103, /* cps =  43584.00, nrm = 32, interval =     8.09 */
+	[205] = 0xbd8b00f9, /* cps =  45376.00, nrm = 32, interval =     7.78 */
+	[206] = 0xbdc500ef, /* cps =  47232.00, nrm = 32, interval =     7.47 */
+	[207] = 0xbe0700e5, /* cps =  49344.00, nrm = 32, interval =     7.16 */
+	[208] = 0xbe4500dc, /* cps =  51328.00, nrm = 32, interval =     6.88 */
+	[209] = 0xbe8900d3, /* cps =  53504.00, nrm = 32, interval =     6.59 */
+	[210] = 0xbecb00cb, /* cps =  55616.00, nrm = 32, interval =     6.34 */
+	[211] = 0xbf1d00c2, /* cps =  58240.00, nrm = 32, interval =     6.06 */
+	[212] = 0xbf6100bb, /* cps =  60416.00, nrm = 32, interval =     5.84 */
+	[213] = 0xbfb500b3, /* cps =  63104.00, nrm = 32, interval =     5.59 */
+	[214] = 0xc00300ac, /* cps =  65664.00, nrm = 32, interval =     5.38 */
+	[215] = 0xc02f00a5, /* cps =  68480.00, nrm = 32, interval =     5.16 */
+	[216] = 0xc05d009e, /* cps =  71424.00, nrm = 32, interval =     4.94 */
+	[217] = 0xc0890098, /* cps =  74240.00, nrm = 32, interval =     4.75 */
+	[218] = 0xc0b90092, /* cps =  77312.00, nrm = 32, interval =     4.56 */
+	[219] = 0xc0ed008c, /* cps =  80640.00, nrm = 32, interval =     4.38 */
+	[220] = 0xc1250086, /* cps =  84224.00, nrm = 32, interval =     4.19 */
+	[221] = 0xc1590081, /* cps =  87552.00, nrm = 32, interval =     4.03 */
+	[222] = 0xc191007c, /* cps =  91136.00, nrm = 32, interval =     3.88 */
+	[223] = 0xc1cd0077, /* cps =  94976.00, nrm = 32, interval =     3.72 */
+	[224] = 0xc20d0072, /* cps =  99072.00, nrm = 32, interval =     3.56 */
+	[225] = 0xc255006d, /* cps = 103680.00, nrm = 32, interval =     3.41 */
+	[226] = 0xc2910069, /* cps = 107520.00, nrm = 32, interval =     3.28 */
+	[227] = 0xc2d50065, /* cps = 111872.00, nrm = 32, interval =     3.16 */
+	[228] = 0xc32f0060, /* cps = 117632.00, nrm = 32, interval =     3.00 */
+	[229] = 0xc36b005d, /* cps = 121472.00, nrm = 32, interval =     2.91 */
+	[230] = 0xc3c10059, /* cps = 126976.00, nrm = 32, interval =     2.78 */
+	[231] = 0xc40f0055, /* cps = 132864.00, nrm = 32, interval =     2.66 */
+	[232] = 0xc4350052, /* cps = 137728.00, nrm = 32, interval =     2.56 */
+	[233] = 0xc46d004e, /* cps = 144896.00, nrm = 32, interval =     2.44 */
+	[234] = 0xc499004b, /* cps = 150528.00, nrm = 32, interval =     2.34 */
+	[235] = 0xc4cb0048, /* cps = 156928.00, nrm = 32, interval =     2.25 */
+	[236] = 0xc4ff0045, /* cps = 163584.00, nrm = 32, interval =     2.16 */
+	[237] = 0xc5250043, /* cps = 168448.00, nrm = 32, interval =     2.09 */
+	[238] = 0xc5630040, /* cps = 176384.00, nrm = 32, interval =     2.00 */
+	[239] = 0xc5a7003d, /* cps = 185088.00, nrm = 32, interval =     1.91 */
+	[240] = 0xc5d9003b, /* cps = 191488.00, nrm = 32, interval =     1.84 */
+	[241] = 0xc6290038, /* cps = 201728.00, nrm = 32, interval =     1.75 */
+	[242] = 0xc6630036, /* cps = 209152.00, nrm = 32, interval =     1.69 */
+	[243] = 0xc6a30034, /* cps = 217344.00, nrm = 32, interval =     1.62 */
+	[244] = 0xc6e70032, /* cps = 226048.00, nrm = 32, interval =     1.56 */
+	[245] = 0xc72f0030, /* cps = 235264.00, nrm = 32, interval =     1.50 */
+	[246] = 0xc77f002e, /* cps = 245504.00, nrm = 32, interval =     1.44 */
+	[247] = 0xc7d7002c, /* cps = 256768.00, nrm = 32, interval =     1.38 */
+	[248] = 0xc81b002a, /* cps = 268800.00, nrm = 32, interval =     1.31 */
+	[249] = 0xc84f0028, /* cps = 282112.00, nrm = 32, interval =     1.25 */
+	[250] = 0xc86d0027, /* cps = 289792.00, nrm = 32, interval =     1.22 */
+	[251] = 0xc8a90025, /* cps = 305152.00, nrm = 32, interval =     1.16 */
+	[252] = 0xc8cb0024, /* cps = 313856.00, nrm = 32, interval =     1.12 */
+	[253] = 0xc9130022, /* cps = 332288.00, nrm = 32, interval =     1.06 */
+	[254] = 0xc9390021, /* cps = 342016.00, nrm = 32, interval =     1.03 */
+	[255] = 0xc9630020, /* cps = 352768.00, nrm = 32, interval =     1.00 */
 };
 
 static unsigned char rate_to_log[] -- 
2.35.1

[PATCH 07/22] cm4000: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/char/pcmcia/cm4000_cs.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index adaec8fd4b16..8082025ab5b7 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -153,18 +153,18 @@ static struct class *cmm_class;
  * violates process/coding-style.rst.  However, I don't really think wrapping it around will
  * make it any clearer to read -HW */
 static unsigned char fi_di_table[10][14] = {
-/*FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
-/*DI */
-/* 0 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 1 */ {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
-/* 2 */ {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
-/* 3 */ {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
-/* 4 */ {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
-/* 5 */ {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
-/* 6 */ {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
-/* 7 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 8 */ {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
-/* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
+/*  FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
+/*  DI */
+	[0] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[1] = {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
+	[2] = {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
+	[3] = {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
+	[4] = {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
+	[5] = {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
+	[6] = {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
+	[7] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[8] = {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
+	[9] = {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
 };
 
 #ifndef CM4000_DEBUG
-- 
2.35.1

[PATCH 07/22] cm4000: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/char/pcmcia/cm4000_cs.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index adaec8fd4b16..8082025ab5b7 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -153,18 +153,18 @@ static struct class *cmm_class;
  * violates process/coding-style.rst.  However, I don't really think wrapping it around will
  * make it any clearer to read -HW */
 static unsigned char fi_di_table[10][14] = {
-/*FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
-/*DI */
-/* 0 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 1 */ {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
-/* 2 */ {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
-/* 3 */ {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
-/* 4 */ {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
-/* 5 */ {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
-/* 6 */ {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
-/* 7 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 8 */ {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
-/* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
+/*  FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
+/*  DI */
+	[0] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[1] = {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
+	[2] = {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
+	[3] = {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
+	[4] = {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
+	[5] = {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
+	[6] = {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
+	[7] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[8] = {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
+	[9] = {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
 };
 
 #ifndef CM4000_DEBUG
-- 
2.35.1

[PATCH 07/22] cm4000: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/char/pcmcia/cm4000_cs.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index adaec8fd4b16..8082025ab5b7 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -153,18 +153,18 @@ static struct class *cmm_class;
  * violates process/coding-style.rst.  However, I don't really think wrapping it around will
  * make it any clearer to read -HW */
 static unsigned char fi_di_table[10][14] = {
-/*FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
-/*DI */
-/* 0 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 1 */ {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
-/* 2 */ {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
-/* 3 */ {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
-/* 4 */ {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
-/* 5 */ {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
-/* 6 */ {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
-/* 7 */ {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-/* 8 */ {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
-/* 9 */ {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
+/*  FI     00   01   02   03   04   05   06   07   08   09   10   11   12   13 */
+/*  DI */
+	[0] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[1] = {0x01,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x91,0x11,0x11,0x11,0x11},
+	[2] = {0x02,0x12,0x22,0x32,0x11,0x11,0x11,0x11,0x11,0x92,0xA2,0xB2,0x11,0x11},
+	[3] = {0x03,0x13,0x23,0x33,0x43,0x53,0x63,0x11,0x11,0x93,0xA3,0xB3,0xC3,0xD3},
+	[4] = {0x04,0x14,0x24,0x34,0x44,0x54,0x64,0x11,0x11,0x94,0xA4,0xB4,0xC4,0xD4},
+	[5] = {0x00,0x15,0x25,0x35,0x45,0x55,0x65,0x11,0x11,0x95,0xA5,0xB5,0xC5,0xD5},
+	[6] = {0x06,0x16,0x26,0x36,0x46,0x56,0x66,0x11,0x11,0x96,0xA6,0xB6,0xC6,0xD6},
+	[7] = {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
+	[8] = {0x08,0x11,0x28,0x38,0x48,0x58,0x68,0x11,0x11,0x98,0xA8,0xB8,0xC8,0xD8},
+	[9] = {0x09,0x19,0x29,0x39,0x49,0x59,0x69,0x11,0x11,0x99,0xA9,0xB9,0xC9,0xD9}
 };
 
 #ifndef CM4000_DEBUG
-- 
2.35.1

[PATCH 08/22] i5100: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/edac/i5100_edac.c | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 324a46b8479b..5992f0ee5f28 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -379,28 +379,28 @@ static int i5100_rank_to_slot(const struct mem_ctl_info *mci,
 static const char *i5100_err_msg(unsigned err)
 {
 	static const char *merrs[] = {
-		"unknown", /* 0 */
-		"uncorrectable data ECC on replay", /* 1 */
-		"unknown", /* 2 */
-		"unknown", /* 3 */
-		"aliased uncorrectable demand data ECC", /* 4 */
-		"aliased uncorrectable spare-copy data ECC", /* 5 */
-		"aliased uncorrectable patrol data ECC", /* 6 */
-		"unknown", /* 7 */
-		"unknown", /* 8 */
-		"unknown", /* 9 */
-		"non-aliased uncorrectable demand data ECC", /* 10 */
-		"non-aliased uncorrectable spare-copy data ECC", /* 11 */
-		"non-aliased uncorrectable patrol data ECC", /* 12 */
-		"unknown", /* 13 */
-		"correctable demand data ECC", /* 14 */
-		"correctable spare-copy data ECC", /* 15 */
-		"correctable patrol data ECC", /* 16 */
-		"unknown", /* 17 */
-		"SPD protocol error", /* 18 */
-		"unknown", /* 19 */
-		"spare copy initiated", /* 20 */
-		"spare copy completed", /* 21 */
+		[0]  = "unknown",
+		[1]  = "uncorrectable data ECC on replay",
+		[2]  = "unknown",
+		[3]  = "unknown",
+		[4]  = "aliased uncorrectable demand data ECC",
+		[5]  = "aliased uncorrectable spare-copy data ECC",
+		[6]  = "aliased uncorrectable patrol data ECC",
+		[7]  = "unknown",
+		[8]  = "unknown",
+		[9]  = "unknown",
+		[10] = "non-aliased uncorrectable demand data ECC",
+		[11] = "non-aliased uncorrectable spare-copy data ECC",
+		[12] = "non-aliased uncorrectable patrol data ECC",
+		[13] = "unknown",
+		[14] = "correctable demand data ECC",
+		[15] = "correctable spare-copy data ECC",
+		[16] = "correctable patrol data ECC",
+		[17] = "unknown",
+		[18] = "SPD protocol error",
+		[19] = "unknown",
+		[20] = "spare copy initiated",
+		[21] = "spare copy completed",
 	};
 	unsigned i;
 
-- 
2.35.1

[PATCH 08/22] i5100: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/edac/i5100_edac.c | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 324a46b8479b..5992f0ee5f28 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -379,28 +379,28 @@ static int i5100_rank_to_slot(const struct mem_ctl_info *mci,
 static const char *i5100_err_msg(unsigned err)
 {
 	static const char *merrs[] = {
-		"unknown", /* 0 */
-		"uncorrectable data ECC on replay", /* 1 */
-		"unknown", /* 2 */
-		"unknown", /* 3 */
-		"aliased uncorrectable demand data ECC", /* 4 */
-		"aliased uncorrectable spare-copy data ECC", /* 5 */
-		"aliased uncorrectable patrol data ECC", /* 6 */
-		"unknown", /* 7 */
-		"unknown", /* 8 */
-		"unknown", /* 9 */
-		"non-aliased uncorrectable demand data ECC", /* 10 */
-		"non-aliased uncorrectable spare-copy data ECC", /* 11 */
-		"non-aliased uncorrectable patrol data ECC", /* 12 */
-		"unknown", /* 13 */
-		"correctable demand data ECC", /* 14 */
-		"correctable spare-copy data ECC", /* 15 */
-		"correctable patrol data ECC", /* 16 */
-		"unknown", /* 17 */
-		"SPD protocol error", /* 18 */
-		"unknown", /* 19 */
-		"spare copy initiated", /* 20 */
-		"spare copy completed", /* 21 */
+		[0]  = "unknown",
+		[1]  = "uncorrectable data ECC on replay",
+		[2]  = "unknown",
+		[3]  = "unknown",
+		[4]  = "aliased uncorrectable demand data ECC",
+		[5]  = "aliased uncorrectable spare-copy data ECC",
+		[6]  = "aliased uncorrectable patrol data ECC",
+		[7]  = "unknown",
+		[8]  = "unknown",
+		[9]  = "unknown",
+		[10] = "non-aliased uncorrectable demand data ECC",
+		[11] = "non-aliased uncorrectable spare-copy data ECC",
+		[12] = "non-aliased uncorrectable patrol data ECC",
+		[13] = "unknown",
+		[14] = "correctable demand data ECC",
+		[15] = "correctable spare-copy data ECC",
+		[16] = "correctable patrol data ECC",
+		[17] = "unknown",
+		[18] = "SPD protocol error",
+		[19] = "unknown",
+		[20] = "spare copy initiated",
+		[21] = "spare copy completed",
 	};
 	unsigned i;
 
-- 
2.35.1

[PATCH 08/22] i5100: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/edac/i5100_edac.c | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 324a46b8479b..5992f0ee5f28 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -379,28 +379,28 @@ static int i5100_rank_to_slot(const struct mem_ctl_info *mci,
 static const char *i5100_err_msg(unsigned err)
 {
 	static const char *merrs[] = {
-		"unknown", /* 0 */
-		"uncorrectable data ECC on replay", /* 1 */
-		"unknown", /* 2 */
-		"unknown", /* 3 */
-		"aliased uncorrectable demand data ECC", /* 4 */
-		"aliased uncorrectable spare-copy data ECC", /* 5 */
-		"aliased uncorrectable patrol data ECC", /* 6 */
-		"unknown", /* 7 */
-		"unknown", /* 8 */
-		"unknown", /* 9 */
-		"non-aliased uncorrectable demand data ECC", /* 10 */
-		"non-aliased uncorrectable spare-copy data ECC", /* 11 */
-		"non-aliased uncorrectable patrol data ECC", /* 12 */
-		"unknown", /* 13 */
-		"correctable demand data ECC", /* 14 */
-		"correctable spare-copy data ECC", /* 15 */
-		"correctable patrol data ECC", /* 16 */
-		"unknown", /* 17 */
-		"SPD protocol error", /* 18 */
-		"unknown", /* 19 */
-		"spare copy initiated", /* 20 */
-		"spare copy completed", /* 21 */
+		[0]  = "unknown",
+		[1]  = "uncorrectable data ECC on replay",
+		[2]  = "unknown",
+		[3]  = "unknown",
+		[4]  = "aliased uncorrectable demand data ECC",
+		[5]  = "aliased uncorrectable spare-copy data ECC",
+		[6]  = "aliased uncorrectable patrol data ECC",
+		[7]  = "unknown",
+		[8]  = "unknown",
+		[9]  = "unknown",
+		[10] = "non-aliased uncorrectable demand data ECC",
+		[11] = "non-aliased uncorrectable spare-copy data ECC",
+		[12] = "non-aliased uncorrectable patrol data ECC",
+		[13] = "unknown",
+		[14] = "correctable demand data ECC",
+		[15] = "correctable spare-copy data ECC",
+		[16] = "correctable patrol data ECC",
+		[17] = "unknown",
+		[18] = "SPD protocol error",
+		[19] = "unknown",
+		[20] = "spare copy initiated",
+		[21] = "spare copy completed",
 	};
 	unsigned i;
 
-- 
2.35.1

[PATCH 09/22] gpio-winbond: Use C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/gpio/gpio-winbond.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
index 7f8f5b02e31d..0b637fdb407c 100644
--- a/drivers/gpio/gpio-winbond.c
+++ b/drivers/gpio/gpio-winbond.c
@@ -249,7 +249,7 @@ struct winbond_gpio_info {
 };
 
 static const struct winbond_gpio_info winbond_gpio_infos[6] = {
-	{ /* 0 */
+	[0] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_1,
@@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 1 */
+	[1] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_2,
@@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 		.datareg = WB_SIO_GPIO12_REG_DATA2
 		/* special conflict handling so doesn't use conflict data */
 	},
-	{ /* 2 */
+	[2] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_3,
@@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 3 */
+	[3] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_4,
@@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 4 */
+	[4] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_5,
@@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 5 */
+	[5] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_6,
-- 
2.35.1

[PATCH 09/22] gpio-winbond: Use C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/gpio/gpio-winbond.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
index 7f8f5b02e31d..0b637fdb407c 100644
--- a/drivers/gpio/gpio-winbond.c
+++ b/drivers/gpio/gpio-winbond.c
@@ -249,7 +249,7 @@ struct winbond_gpio_info {
 };
 
 static const struct winbond_gpio_info winbond_gpio_infos[6] = {
-	{ /* 0 */
+	[0] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_1,
@@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 1 */
+	[1] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_2,
@@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 		.datareg = WB_SIO_GPIO12_REG_DATA2
 		/* special conflict handling so doesn't use conflict data */
 	},
-	{ /* 2 */
+	[2] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_3,
@@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 3 */
+	[3] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_4,
@@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 4 */
+	[4] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_5,
@@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 5 */
+	[5] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_6,
-- 
2.35.1

[PATCH 09/22] gpio-winbond: Use C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/gpio/gpio-winbond.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
index 7f8f5b02e31d..0b637fdb407c 100644
--- a/drivers/gpio/gpio-winbond.c
+++ b/drivers/gpio/gpio-winbond.c
@@ -249,7 +249,7 @@ struct winbond_gpio_info {
 };
 
 static const struct winbond_gpio_info winbond_gpio_infos[6] = {
-	{ /* 0 */
+	[0] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_1,
@@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 1 */
+	[1] = {
 		.dev = WB_SIO_DEV_GPIO12,
 		.enablereg = WB_SIO_GPIO12_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO12_ENABLE_2,
@@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 		.datareg = WB_SIO_GPIO12_REG_DATA2
 		/* special conflict handling so doesn't use conflict data */
 	},
-	{ /* 2 */
+	[2] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_3,
@@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 3 */
+	[3] = {
 		.dev = WB_SIO_DEV_GPIO34,
 		.enablereg = WB_SIO_GPIO34_REG_ENABLE,
 		.enablebit = WB_SIO_GPIO34_ENABLE_4,
@@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 4 */
+	[4] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_5,
@@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
 			.warnonly = true
 		}
 	},
-	{ /* 5 */
+	[5] = {
 		.dev = WB_SIO_DEV_WDGPIO56,
 		.enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
 		.enablebit = WB_SIO_WDGPIO56_ENABLE_6,
-- 
2.35.1

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Linus Walleij]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Linus Walleij]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Linus Walleij]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Bartosz Golaszewski]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/gpio/gpio-winbond.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
> index 7f8f5b02e31d..0b637fdb407c 100644
> --- a/drivers/gpio/gpio-winbond.c
> +++ b/drivers/gpio/gpio-winbond.c
> @@ -249,7 +249,7 @@ struct winbond_gpio_info {
>  };
>
>  static const struct winbond_gpio_info winbond_gpio_infos[6] = {
> -       { /* 0 */
> +       [0] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_1,
> @@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 1 */
> +       [1] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_2,
> @@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                 .datareg = WB_SIO_GPIO12_REG_DATA2
>                 /* special conflict handling so doesn't use conflict data */
>         },
> -       { /* 2 */
> +       [2] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_3,
> @@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 3 */
> +       [3] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_4,
> @@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 4 */
> +       [4] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_5,
> @@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 5 */
> +       [5] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_6,
> --
> 2.35.1
>

Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Bartosz Golaszewski]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/gpio/gpio-winbond.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
> index 7f8f5b02e31d..0b637fdb407c 100644
> --- a/drivers/gpio/gpio-winbond.c
> +++ b/drivers/gpio/gpio-winbond.c
> @@ -249,7 +249,7 @@ struct winbond_gpio_info {
>  };
>
>  static const struct winbond_gpio_info winbond_gpio_infos[6] = {
> -       { /* 0 */
> +       [0] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_1,
> @@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 1 */
> +       [1] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_2,
> @@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                 .datareg = WB_SIO_GPIO12_REG_DATA2
>                 /* special conflict handling so doesn't use conflict data */
>         },
> -       { /* 2 */
> +       [2] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_3,
> @@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 3 */
> +       [3] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_4,
> @@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 4 */
> +       [4] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_5,
> @@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 5 */
> +       [5] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_6,
> --
> 2.35.1
>

Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>

Re: [PATCH 09/22] gpio-winbond: Use C99 initializers

[Bartosz Golaszewski]

On Sat, Mar 26, 2022 at 6:00 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
>
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/gpio/gpio-winbond.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c
> index 7f8f5b02e31d..0b637fdb407c 100644
> --- a/drivers/gpio/gpio-winbond.c
> +++ b/drivers/gpio/gpio-winbond.c
> @@ -249,7 +249,7 @@ struct winbond_gpio_info {
>  };
>
>  static const struct winbond_gpio_info winbond_gpio_infos[6] = {
> -       { /* 0 */
> +       [0] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_1,
> @@ -266,7 +266,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 1 */
> +       [1] = {
>                 .dev = WB_SIO_DEV_GPIO12,
>                 .enablereg = WB_SIO_GPIO12_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO12_ENABLE_2,
> @@ -277,7 +277,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                 .datareg = WB_SIO_GPIO12_REG_DATA2
>                 /* special conflict handling so doesn't use conflict data */
>         },
> -       { /* 2 */
> +       [2] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_3,
> @@ -294,7 +294,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 3 */
> +       [3] = {
>                 .dev = WB_SIO_DEV_GPIO34,
>                 .enablereg = WB_SIO_GPIO34_REG_ENABLE,
>                 .enablebit = WB_SIO_GPIO34_ENABLE_4,
> @@ -311,7 +311,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 4 */
> +       [4] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_5,
> @@ -328,7 +328,7 @@ static const struct winbond_gpio_info winbond_gpio_infos[6] = {
>                         .warnonly = true
>                 }
>         },
> -       { /* 5 */
> +       [5] = {
>                 .dev = WB_SIO_DEV_WDGPIO56,
>                 .enablereg = WB_SIO_WDGPIO56_REG_ENABLE,
>                 .enablebit = WB_SIO_WDGPIO56_ENABLE_6,
> --
> 2.35.1
>

Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>

[PATCH 10/22] hfi1: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/hw/hfi1/chip.c | 918 +++++++++++++++---------------
 drivers/infiniband/hw/hfi1/mad.c  |  34 +-
 2 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index f1245c94ae26..e9b8a7220f5d 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -252,88 +252,88 @@ struct flag_table {
  * CCE Error flags.
  */
 static struct flag_table cce_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CceCsrParityErr",
-		CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("CceCsrReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 4*/	FLAG_ENTRY0("CceTrgtAccessErr",
-		CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
-/* 5*/	FLAG_ENTRY0("CceRspdDataParityErr",
-		CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY0("CceCsrCfgBusParityErr",
-		CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
-/*12*/	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
-		CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
-/*13*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
-/*16*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
-/*17*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
-/*18*/	FLAG_ENTRY0("PcicCplDatQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
-/*19*/	FLAG_ENTRY0("PcicNPostHQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
-/*20*/	FLAG_ENTRY0("PcicNPostDatQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
-/*21*/	FLAG_ENTRY0("PcicRetryMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
-/*22*/	FLAG_ENTRY0("PcicRetrySotMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
-/*23*/	FLAG_ENTRY0("PcicPostHdQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
-/*24*/	FLAG_ENTRY0("PcicPostDatQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
-/*25*/	FLAG_ENTRY0("PcicCplHdQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
-/*26*/	FLAG_ENTRY0("PcicCplDatQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
-/*27*/	FLAG_ENTRY0("PcicTransmitFrontParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY0("PcicTransmitBackParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY0("PcicReceiveParityErr",
-		CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
-/*30*/	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
-		CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
-/*31*/	FLAG_ENTRY0("LATriggered",
-		CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
-/*32*/	FLAG_ENTRY0("CceSegReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
-/*33*/	FLAG_ENTRY0("CceSegWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
-/*34*/	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
-		CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
-/*36*/	FLAG_ENTRY0("CceMsixTableCorErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
-/*37*/	FLAG_ENTRY0("CceMsixTableUncErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
-/*38*/	FLAG_ENTRY0("CceIntMapCorErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
-/*39*/	FLAG_ENTRY0("CceIntMapUncErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
-/*40*/	FLAG_ENTRY0("CceMsixCsrParityErr",
-		CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("CceCsrParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("CceCsrReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
+[4]  =	FLAG_ENTRY0("CceTrgtAccessErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
+[5]  =	FLAG_ENTRY0("CceRspdDataParityErr",
+		   CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY0("CceCsrCfgBusParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	      CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
+[12] =	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
+		   CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
+[13] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
+[16] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
+[17] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
+[18] =	FLAG_ENTRY0("PcicCplDatQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
+[19] =	FLAG_ENTRY0("PcicNPostHQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
+[20] =	FLAG_ENTRY0("PcicNPostDatQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
+[21] =	FLAG_ENTRY0("PcicRetryMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
+[22] =	FLAG_ENTRY0("PcicRetrySotMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
+[23] =	FLAG_ENTRY0("PcicPostHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
+[24] =	FLAG_ENTRY0("PcicPostDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
+[25] =	FLAG_ENTRY0("PcicCplHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
+[26] =	FLAG_ENTRY0("PcicCplDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
+[27] =	FLAG_ENTRY0("PcicTransmitFrontParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY0("PcicTransmitBackParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY0("PcicReceiveParityErr",
+		   CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
+[30] =	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
+		   CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
+[31] =	FLAG_ENTRY0("LATriggered",
+		   CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
+[32] =	FLAG_ENTRY0("CceSegReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
+[33] =	FLAG_ENTRY0("CceSegWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
+[34] =	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
+[36] =	FLAG_ENTRY0("CceMsixTableCorErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
+[37] =	FLAG_ENTRY0("CceMsixTableUncErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
+[38] =	FLAG_ENTRY0("CceIntMapCorErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
+[39] =	FLAG_ENTRY0("CceIntMapUncErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
+[40] =	FLAG_ENTRY0("CceMsixCsrParityErr",
+		   CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
 /*41-63 reserved*/
 };
 
@@ -342,128 +342,128 @@ static struct flag_table cce_err_status_flags[] = {
  */
 #define MES(text) MISC_ERR_STATUS_MISC_##text##_ERR_SMASK
 static struct flag_table misc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
-/* 3*/	FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
-/* 4*/	FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
-/* 5*/	FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
-/* 6*/	FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
-/* 7*/	FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
-/* 8*/	FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
-/* 9*/	FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
-/*10*/	FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
-/*11*/	FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
-/*12*/	FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
+	[0]  = FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
+	[1]  = FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
+	[2]  = FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
+	[3]  = FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
+	[4]  = FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
+	[5]  = FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
+	[6]  = FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
+	[7]  = FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
+	[8]  = FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
+	[9]  = FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
+	[10] = FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
+	[11] = FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
+	[12] = FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
 };
 
 /*
  * TXE PIO Error flags and consequences
  */
 static struct flag_table pio_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("PioWriteBadCtxt",
-	SEC_WRITE_DROPPED,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("PioWriteAddrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("PioCsrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("PioSbMemFifo0",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("PioSbMemFifo1",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
-/* 5*/	FLAG_ENTRY("PioPccFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY("PioPecFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY("PioSbrdctlCrrelParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY("PioPktEvictFifoParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY("PioSmPktResetParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY("PioVlLenMemBank0Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
-/*12*/	FLAG_ENTRY("PioVlLenMemBank1Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
-/*13*/	FLAG_ENTRY("PioVlLenMemBank0Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY("PioVlLenMemBank1Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY("PioCreditRetFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
-/*16*/	FLAG_ENTRY("PioPpmcPblFifo",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
-/*17*/	FLAG_ENTRY("PioInitSmIn",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
-/*18*/	FLAG_ENTRY("PioPktEvictSmOrArbSm",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
-/*19*/	FLAG_ENTRY("PioHostAddrMemUnc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
-/*20*/	FLAG_ENTRY("PioHostAddrMemCor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
-/*21*/	FLAG_ENTRY("PioWriteDataParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
-/*22*/	FLAG_ENTRY("PioStateMachine",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
-/*23*/	FLAG_ENTRY("PioWriteQwValidParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
-/*24*/	FLAG_ENTRY("PioBlockQwCountParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
-/*25*/	FLAG_ENTRY("PioVlfVlLenParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
-/*26*/	FLAG_ENTRY("PioVlfSopParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
-/*27*/	FLAG_ENTRY("PioVlFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY("PioPpmcBqcMemParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY("PioPpmcSopLen",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
+[0]  =	FLAG_ENTRY("PioWriteBadCtxt",
+	      SEC_WRITE_DROPPED,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
+[1]  =	FLAG_ENTRY("PioWriteAddrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY("PioCsrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
+[3]  =	FLAG_ENTRY("PioSbMemFifo0",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
+[4]  =	FLAG_ENTRY("PioSbMemFifo1",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
+[5]  =	FLAG_ENTRY("PioPccFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY("PioPecFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY("PioSbrdctlCrrelParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY("PioPktEvictFifoParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY("PioSmPktResetParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY("PioVlLenMemBank0Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
+[12] =	FLAG_ENTRY("PioVlLenMemBank1Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
+[13] =	FLAG_ENTRY("PioVlLenMemBank0Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY("PioVlLenMemBank1Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY("PioCreditRetFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
+[16] =	FLAG_ENTRY("PioPpmcPblFifo",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
+[17] =	FLAG_ENTRY("PioInitSmIn",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
+[18] =	FLAG_ENTRY("PioPktEvictSmOrArbSm",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
+[19] =	FLAG_ENTRY("PioHostAddrMemUnc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
+[20] =	FLAG_ENTRY("PioHostAddrMemCor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
+[21] =	FLAG_ENTRY("PioWriteDataParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
+[22] =	FLAG_ENTRY("PioStateMachine",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
+[23] =	FLAG_ENTRY("PioWriteQwValidParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
+[24] =	FLAG_ENTRY("PioBlockQwCountParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
+[25] =	FLAG_ENTRY("PioVlfVlLenParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
+[26] =	FLAG_ENTRY("PioVlfSopParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
+[27] =	FLAG_ENTRY("PioVlFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY("PioPpmcBqcMemParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY("PioPpmcSopLen",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
 /*30-31 reserved*/
-/*32*/	FLAG_ENTRY("PioCurrentFreeCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
-/*33*/	FLAG_ENTRY("PioLastReturnedCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
-/*34*/	FLAG_ENTRY("PioPccSopHeadParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY("PioPecSopHeadParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
+[32] =	FLAG_ENTRY("PioCurrentFreeCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
+[33] =	FLAG_ENTRY("PioLastReturnedCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
+[34] =	FLAG_ENTRY("PioPccSopHeadParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY("PioPecSopHeadParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
 /*36-63 reserved*/
 };
 
@@ -503,14 +503,14 @@ static struct flag_table pio_err_status_flags[] = {
  * TXE SDMA Error flags
  */
 static struct flag_table sdma_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SDmaRpyTagErr",
-		SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("SDmaCsrParityErr",
-		SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("SDmaRpyTagErr",
+		   SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("SDmaCsrParityErr",
+		   SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
 /*04-63 reserved*/
 };
 
@@ -531,100 +531,100 @@ static struct flag_table sdma_err_status_flags[] = {
  */
 #define SEES(text) SEND_EGRESS_ERR_STATUS_##text##_ERR_SMASK
 static struct flag_table egress_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
-/* 1*/	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
+[0]  =	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
+[1]  =	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
 /* 2 reserved */
-/* 3*/	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
-		SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
-/* 4*/	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
-/* 5*/	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
+[3]  =	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
+		   SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
+[4]  =	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
+[5]  =	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
 /* 6 reserved */
-/* 7*/	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
-		SEES(TX_PIO_LAUNCH_INTF_PARITY)),
-/* 8*/	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
-		SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
+[7]  =	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
+		   SEES(TX_PIO_LAUNCH_INTF_PARITY)),
+[8]  =	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
+		   SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
 /* 9-10 reserved */
-/*11*/	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
-		SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
-/*12*/	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
-/*13*/	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
-/*14*/	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
-/*15*/	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
-/*16*/	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
-		SEES(TX_SDMA0_DISALLOWED_PACKET)),
-/*17*/	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
-		SEES(TX_SDMA1_DISALLOWED_PACKET)),
-/*18*/	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
-		SEES(TX_SDMA2_DISALLOWED_PACKET)),
-/*19*/	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
-		SEES(TX_SDMA3_DISALLOWED_PACKET)),
-/*20*/	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
-		SEES(TX_SDMA4_DISALLOWED_PACKET)),
-/*21*/	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
-		SEES(TX_SDMA5_DISALLOWED_PACKET)),
-/*22*/	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
-		SEES(TX_SDMA6_DISALLOWED_PACKET)),
-/*23*/	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
-		SEES(TX_SDMA7_DISALLOWED_PACKET)),
-/*24*/	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
-		SEES(TX_SDMA8_DISALLOWED_PACKET)),
-/*25*/	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
-		SEES(TX_SDMA9_DISALLOWED_PACKET)),
-/*26*/	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
-		SEES(TX_SDMA10_DISALLOWED_PACKET)),
-/*27*/	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
-		SEES(TX_SDMA11_DISALLOWED_PACKET)),
-/*28*/	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
-		SEES(TX_SDMA12_DISALLOWED_PACKET)),
-/*29*/	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
-		SEES(TX_SDMA13_DISALLOWED_PACKET)),
-/*30*/	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
-		SEES(TX_SDMA14_DISALLOWED_PACKET)),
-/*31*/	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
-		SEES(TX_SDMA15_DISALLOWED_PACKET)),
-/*32*/	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
-/*33*/	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
-/*34*/	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
-/*35*/	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
-/*36*/	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
-/*37*/	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
-/*38*/	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
-/*39*/	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
-/*40*/	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
-/*41*/	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
-/*42*/	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
-/*43*/	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
-/*44*/	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
-/*45*/	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
-/*46*/	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
-/*47*/	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
-/*48*/	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
-/*49*/	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
-/*50*/	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
-/*51*/	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
-/*52*/	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
-/*53*/	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
-/*54*/	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
-/*55*/	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
-/*56*/	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
-/*57*/	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
-/*58*/	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
-/*59*/	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
-/*60*/	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
-/*61*/	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
-/*62*/	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
-		SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
-/*63*/	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
-		SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
+[11] =	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
+		   SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
+[12] =	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
+[13] =	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
+[14] =	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
+[15] =	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
+[16] =	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
+		   SEES(TX_SDMA0_DISALLOWED_PACKET)),
+[17] =	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
+		   SEES(TX_SDMA1_DISALLOWED_PACKET)),
+[18] =	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
+		   SEES(TX_SDMA2_DISALLOWED_PACKET)),
+[19] =	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
+		   SEES(TX_SDMA3_DISALLOWED_PACKET)),
+[20] =	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
+		   SEES(TX_SDMA4_DISALLOWED_PACKET)),
+[21] =	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
+		   SEES(TX_SDMA5_DISALLOWED_PACKET)),
+[22] =	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
+		   SEES(TX_SDMA6_DISALLOWED_PACKET)),
+[23] =	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
+		   SEES(TX_SDMA7_DISALLOWED_PACKET)),
+[24] =	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
+		   SEES(TX_SDMA8_DISALLOWED_PACKET)),
+[25] =	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
+		   SEES(TX_SDMA9_DISALLOWED_PACKET)),
+[26] =	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
+		   SEES(TX_SDMA10_DISALLOWED_PACKET)),
+[27] =	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
+		   SEES(TX_SDMA11_DISALLOWED_PACKET)),
+[28] =	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
+		   SEES(TX_SDMA12_DISALLOWED_PACKET)),
+[29] =	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
+		   SEES(TX_SDMA13_DISALLOWED_PACKET)),
+[30] =	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
+		   SEES(TX_SDMA14_DISALLOWED_PACKET)),
+[31] =	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
+		   SEES(TX_SDMA15_DISALLOWED_PACKET)),
+[32] =	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
+[33] =	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
+[34] =	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
+[35] =	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
+[36] =	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
+[37] =	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
+[38] =	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
+[39] =	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
+[40] =	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
+[41] =	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
+[42] =	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
+[43] =	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
+[44] =	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
+[45] =	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
+[46] =	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
+[47] =	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
+[48] =	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
+[49] =	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
+[50] =	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
+[51] =	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
+[52] =	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
+[53] =	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
+[54] =	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
+[55] =	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
+[56] =	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
+[57] =	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
+[58] =	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
+[59] =	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
+[60] =	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
+[61] =	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
+[62] =	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
+		   SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
+[63] =	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
+		   SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
 };
 
 /*
@@ -632,28 +632,28 @@ static struct flag_table egress_err_status_flags[] = {
  */
 #define SEEI(text) SEND_EGRESS_ERR_INFO_##text##_ERR_SMASK
 static struct flag_table egress_err_info_flags[] = {
-/* 0*/	FLAG_ENTRY0("Reserved", 0ull),
-/* 1*/	FLAG_ENTRY0("VLErr", SEEI(VL)),
-/* 2*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 3*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 4*/	FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
-/* 5*/	FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
-/* 6*/	FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
-/* 7*/	FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
-/* 8*/	FLAG_ENTRY0("RawErr", SEEI(RAW)),
-/* 9*/	FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
-/*10*/	FLAG_ENTRY0("GRHErr", SEEI(GRH)),
-/*11*/	FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
-/*12*/	FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
-/*13*/	FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
-/*14*/	FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
-/*15*/	FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
-/*16*/	FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
-/*17*/	FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
-/*18*/	FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
-/*19*/	FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
-/*20*/	FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
-/*21*/	FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
+[0]  = FLAG_ENTRY0("Reserved", 0ull),
+[1]  = FLAG_ENTRY0("VLErr", SEEI(VL)),
+[2]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[3]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[4]  = FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
+[5]  = FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
+[6]  = FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
+[7]  = FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
+[8]  = FLAG_ENTRY0("RawErr", SEEI(RAW)),
+[9]  = FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
+[10] = FLAG_ENTRY0("GRHErr", SEEI(GRH)),
+[11] = FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
+[12] = FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
+[13] = FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
+[14] = FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
+[15] = FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
+[16] = FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
+[17] = FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
+[18] = FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
+[19] = FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
+[20] = FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
+[21] = FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
 };
 
 /* TXE Egress errors that cause an SPC freeze */
@@ -681,28 +681,28 @@ static struct flag_table egress_err_info_flags[] = {
  */
 #define SES(name) SEND_ERR_STATUS_SEND_##name##_ERR_SMASK
 static struct flag_table send_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
+[0] = FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
+[1] = FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
+[2] = FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
 };
 
 /*
  * TXE Send Context Error flags and consequences
  */
 static struct flag_table sc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("InconsistentSop",
+[0] =	FLAG_ENTRY("InconsistentSop",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_INCONSISTENT_SOP_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("DisallowedPacket",
+[1] =	FLAG_ENTRY("DisallowedPacket",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_DISALLOWED_PACKET_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("WriteCrossesBoundary",
+[2] =	FLAG_ENTRY("WriteCrossesBoundary",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_CROSSES_BOUNDARY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("WriteOverflow",
+[3] =	FLAG_ENTRY("WriteOverflow",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OVERFLOW_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("WriteOutOfBounds",
+[4] =	FLAG_ENTRY("WriteOutOfBounds",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OUT_OF_BOUNDS_ERR_SMASK),
 /* 5-63 reserved*/
@@ -713,82 +713,82 @@ static struct flag_table sc_err_status_flags[] = {
  */
 #define RXES(name) RCV_ERR_STATUS_RX_##name##_ERR_SMASK
 static struct flag_table rxe_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
-/* 1*/	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
-/* 2*/	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
-/* 3*/	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
-/* 4*/	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
-/* 5*/	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
-/* 6*/	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
-/* 7*/	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
-/* 8*/	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
-/* 9*/	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
-/*10*/	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
-/*11*/	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
-/*12*/	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
-/*13*/	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
-/*14*/	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
-/*15*/	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
-/*16*/	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
-		RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
-/*17*/	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
-/*18*/	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
-/*19*/	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
-		RXES(RBUF_BLOCK_LIST_READ_UNC)),
-/*20*/	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
-		RXES(RBUF_BLOCK_LIST_READ_COR)),
-/*21*/	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
-		RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
-/*22*/	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
-		RXES(RBUF_CSR_QENT_CNT_PARITY)),
-/*23*/	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
-		RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
-/*24*/	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
-		RXES(RBUF_CSR_QVLD_BIT_PARITY)),
-/*25*/	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
-/*26*/	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
-/*27*/	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
-		RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
-/*28*/	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
-/*29*/	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
-/*30*/	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
-/*31*/	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
-/*32*/	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
-/*33*/	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
-/*34*/	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
-/*35*/	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
-		RXES(RBUF_FL_INITDONE_PARITY)),
-/*36*/	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
-		RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
-/*37*/	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
-/*38*/	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
-/*39*/	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
-/*40*/	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
-		RXES(LOOKUP_DES_PART1_UNC_COR)),
-/*41*/	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
-		RXES(LOOKUP_DES_PART2_PARITY)),
-/*42*/	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
-/*43*/	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
-/*44*/	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
-/*45*/	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
-/*46*/	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
-/*47*/	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
-/*48*/	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
-/*49*/	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
-/*50*/	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
-/*51*/	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
-/*52*/	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
-/*53*/	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
-/*54*/	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
-/*55*/	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
-/*56*/	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
-/*57*/	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
-/*58*/	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
-/*59*/	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
-/*60*/	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
-/*61*/	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
-/*62*/	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
-/*63*/	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
+[0]  =	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
+[1]  =	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
+[2]  =	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
+[3]  =	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
+[4]  =	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
+[5]  =	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
+[6]  =	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
+[7]  =	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
+[8]  =	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
+[9]  =	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
+[10] =	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
+[11] =	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
+[12] =	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
+[13] =	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
+[14] =	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
+[15] =	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
+[16] =	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
+		   RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
+[17] =	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
+[18] =	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
+[19] =	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
+		   RXES(RBUF_BLOCK_LIST_READ_UNC)),
+[20] =	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
+		   RXES(RBUF_BLOCK_LIST_READ_COR)),
+[21] =	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
+		   RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
+[22] =	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
+		   RXES(RBUF_CSR_QENT_CNT_PARITY)),
+[23] =	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
+		   RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
+[24] =	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
+		   RXES(RBUF_CSR_QVLD_BIT_PARITY)),
+[25] =	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
+[26] =	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
+[27] =	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
+		   RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
+[28] =	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
+[29] =	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
+[30] =	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
+[31] =	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
+[32] =	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
+[33] =	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
+[34] =	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
+[35] =	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
+		   RXES(RBUF_FL_INITDONE_PARITY)),
+[36] =	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
+		   RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
+[37] =	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
+[38] =	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
+[39] =	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
+[40] =	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
+		   RXES(LOOKUP_DES_PART1_UNC_COR)),
+[41] =	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
+		   RXES(LOOKUP_DES_PART2_PARITY)),
+[42] =	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
+[43] =	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
+[44] =	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
+[45] =	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
+[46] =	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
+[47] =	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
+[48] =	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
+[49] =	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
+[50] =	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
+[51] =	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
+[52] =	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
+[53] =	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
+[54] =	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
+[55] =	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
+[56] =	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
+[57] =	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
+[58] =	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
+[59] =	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
+[60] =	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
+[61] =	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
+[62] =	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
+[63] =	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
 };
 
 /* RXE errors that will trigger an SPC freeze */
@@ -901,42 +901,42 @@ static struct flag_table dcc_err_flags[] = {
  */
 #define LCBE(name) DC_LCB_ERR_FLG_##name##_SMASK
 static struct flag_table lcb_err_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
-/* 1*/	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
-/* 2*/	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
-/* 3*/	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
-		LCBE(ALL_LNS_FAILED_REINIT_TEST)),
-/* 4*/	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
-/* 5*/	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
-/* 6*/	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
-/* 7*/	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
-/* 8*/	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
-/* 9*/	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
-/*10*/	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
-/*11*/	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
-/*12*/	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
-/*13*/	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
-		LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
-/*14*/	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
-/*15*/	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
-/*16*/	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
-/*17*/	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
-/*18*/	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
-/*19*/	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
-		LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
-/*20*/	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
-/*21*/	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
-/*22*/	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
-/*23*/	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
-/*24*/	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
-/*25*/	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
-/*26*/	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
-		LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
-/*27*/	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
-/*28*/	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
-		LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
-/*29*/	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
-		LCBE(REDUNDANT_FLIT_PARITY_ERR))
+[0]  =	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
+[1]  =	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
+[2]  =	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
+[3]  =	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
+		   LCBE(ALL_LNS_FAILED_REINIT_TEST)),
+[4]  =	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
+[5]  =	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
+[6]  =	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
+[7]  =	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
+[8]  =	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
+[9]  =	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
+[10] =	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
+[11] =	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
+[12] =	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
+[13] =	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
+		   LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
+[14] =	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
+[15] =	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
+[16] =	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
+[17] =	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
+[18] =	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
+[19] =	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
+		   LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
+[20] =	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
+[21] =	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
+[22] =	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
+[23] =	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
+[24] =	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
+[25] =	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
+[26] =	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
+		   LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
+[27] =	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
+[28] =	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
+		   LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
+[29] =	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
+		   LCBE(REDUNDANT_FLIT_PARITY_ERR))
 };
 
 /*
@@ -1098,14 +1098,14 @@ struct err_reg_info {
  * another register containing more information.
  */
 static const struct err_reg_info misc_errs[NUM_MISC_ERRS] = {
-/* 0*/	EE(CCE_ERR,		handle_cce_err,    "CceErr"),
-/* 1*/	EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
-/* 2*/	EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
-/* 3*/	{ 0, 0, 0, NULL }, /* reserved */
-/* 4*/	EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
-/* 5*/	EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
-/* 6*/	EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
-/* 7*/	EE(SEND_ERR,	handle_txe_err,    "TxeErr")
+	[0] = EE(CCE_ERR,		handle_cce_err,    "CceErr"),
+	[1] = EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
+	[2] = EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
+	[3] = { 0, 0, 0, NULL }, /* reserved */
+	[4] = EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
+	[5] = EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
+	[6] = EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
+	[7] = EE(SEND_ERR,	handle_txe_err,    "TxeErr")
 	/* the rest are reserved */
 };
 
@@ -1123,11 +1123,11 @@ static const struct err_reg_info sdma_eng_err =
 	EE(SEND_DMA_ENG_ERR, handle_sdma_eng_err, "SDmaEngErr");
 
 static const struct err_reg_info various_err[NUM_VARIOUS] = {
-/* 0*/	{ 0, 0, 0, NULL }, /* PbcInt */
-/* 1*/	{ 0, 0, 0, NULL }, /* GpioAssertInt */
-/* 2*/	EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
-/* 3*/	EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
-/* 4*/	{ 0, 0, 0, NULL }, /* TCritInt */
+	[0] = { 0, 0, 0, NULL }, /* PbcInt */
+	[1] = { 0, 0, 0, NULL }, /* GpioAssertInt */
+	[2] = EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
+	[3] = EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
+	[4] = { 0, 0, 0, NULL }, /* TCritInt */
 	/* rest are reserved */
 };
 
@@ -5317,14 +5317,14 @@ static char *flag_string(char *buf, int buf_len, u64 flags,
 
 /* first 8 CCE error interrupt source names */
 static const char * const cce_misc_names[] = {
-	"CceErrInt",		/* 0 */
-	"RxeErrInt",		/* 1 */
-	"MiscErrInt",		/* 2 */
-	"Reserved3",		/* 3 */
-	"PioErrInt",		/* 4 */
-	"SDmaErrInt",		/* 5 */
-	"EgressErrInt",		/* 6 */
-	"TxeErrInt"		/* 7 */
+	[0] = "CceErrInt",
+	[1] = "RxeErrInt",
+	[2] = "MiscErrInt",
+	[3] = "Reserved3",
+	[4] = "PioErrInt",
+	[5] = "SDmaErrInt",
+	[6] = "EgressErrInt",
+	[7] = "TxeErrInt"
 };
 
 /*
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 4146a2113a95..a5cc1979b73a 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -1065,17 +1065,17 @@ static const struct {
 	u8 allowed[__N_PHYSTATES][__N_PHYSTATES];
 } physical_state_transitions = {
 	{
-		/* 2    3    4    5    6    7    8    9   10   11 */
-	/* 2 */	{ __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
-	/* 3 */	{ __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
-	/* 4 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 5 */	{ __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
-	/* 6 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 7 */	{ __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
-	/* 8 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 9 */	{ __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
-	/*10 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/*11 */	{ __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
+		     /* 2    3    4    5    6    7    8    9   10   11 */
+	[2]  = { __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
+	[3]  = { __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
+	[4]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[5]  = { __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
+	[6]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[7]  = { __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
+	[8]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[9]  = { __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
+	[10] = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[11] = { __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
 	}
 };
 
@@ -1096,12 +1096,12 @@ static const struct {
 	u8 allowed[__N_LOGICAL_STATES][__N_LOGICAL_STATES];
 } logical_state_transitions = {
 	{
-		/* 1    2    3    4    5 */
-	/* 1 */	{ __I, __D, __D, __D, __U},
-	/* 2 */	{ __D, __I, __A, __D, __U},
-	/* 3 */	{ __D, __D, __I, __A, __U},
-	/* 4 */	{ __D, __D, __I, __I, __U},
-	/* 5 */	{ __U, __U, __U, __U, __U},
+		     /* 1    2    3    4    5 */
+	[1] = { __I, __D, __D, __D, __U},
+	[2] = { __D, __I, __A, __D, __U},
+	[3] = { __D, __D, __I, __A, __U},
+	[4] = { __D, __D, __I, __I, __U},
+	[5] = { __U, __U, __U, __U, __U},
 	}
 };
 
-- 
2.35.1

[PATCH 10/22] hfi1: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/hw/hfi1/chip.c | 918 +++++++++++++++---------------
 drivers/infiniband/hw/hfi1/mad.c  |  34 +-
 2 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index f1245c94ae26..e9b8a7220f5d 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -252,88 +252,88 @@ struct flag_table {
  * CCE Error flags.
  */
 static struct flag_table cce_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CceCsrParityErr",
-		CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("CceCsrReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 4*/	FLAG_ENTRY0("CceTrgtAccessErr",
-		CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
-/* 5*/	FLAG_ENTRY0("CceRspdDataParityErr",
-		CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY0("CceCsrCfgBusParityErr",
-		CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
-/*12*/	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
-		CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
-/*13*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
-/*16*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
-/*17*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
-/*18*/	FLAG_ENTRY0("PcicCplDatQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
-/*19*/	FLAG_ENTRY0("PcicNPostHQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
-/*20*/	FLAG_ENTRY0("PcicNPostDatQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
-/*21*/	FLAG_ENTRY0("PcicRetryMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
-/*22*/	FLAG_ENTRY0("PcicRetrySotMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
-/*23*/	FLAG_ENTRY0("PcicPostHdQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
-/*24*/	FLAG_ENTRY0("PcicPostDatQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
-/*25*/	FLAG_ENTRY0("PcicCplHdQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
-/*26*/	FLAG_ENTRY0("PcicCplDatQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
-/*27*/	FLAG_ENTRY0("PcicTransmitFrontParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY0("PcicTransmitBackParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY0("PcicReceiveParityErr",
-		CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
-/*30*/	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
-		CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
-/*31*/	FLAG_ENTRY0("LATriggered",
-		CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
-/*32*/	FLAG_ENTRY0("CceSegReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
-/*33*/	FLAG_ENTRY0("CceSegWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
-/*34*/	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
-		CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
-/*36*/	FLAG_ENTRY0("CceMsixTableCorErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
-/*37*/	FLAG_ENTRY0("CceMsixTableUncErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
-/*38*/	FLAG_ENTRY0("CceIntMapCorErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
-/*39*/	FLAG_ENTRY0("CceIntMapUncErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
-/*40*/	FLAG_ENTRY0("CceMsixCsrParityErr",
-		CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("CceCsrParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("CceCsrReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
+[4]  =	FLAG_ENTRY0("CceTrgtAccessErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
+[5]  =	FLAG_ENTRY0("CceRspdDataParityErr",
+		   CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY0("CceCsrCfgBusParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	      CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
+[12] =	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
+		   CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
+[13] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
+[16] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
+[17] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
+[18] =	FLAG_ENTRY0("PcicCplDatQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
+[19] =	FLAG_ENTRY0("PcicNPostHQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
+[20] =	FLAG_ENTRY0("PcicNPostDatQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
+[21] =	FLAG_ENTRY0("PcicRetryMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
+[22] =	FLAG_ENTRY0("PcicRetrySotMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
+[23] =	FLAG_ENTRY0("PcicPostHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
+[24] =	FLAG_ENTRY0("PcicPostDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
+[25] =	FLAG_ENTRY0("PcicCplHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
+[26] =	FLAG_ENTRY0("PcicCplDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
+[27] =	FLAG_ENTRY0("PcicTransmitFrontParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY0("PcicTransmitBackParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY0("PcicReceiveParityErr",
+		   CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
+[30] =	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
+		   CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
+[31] =	FLAG_ENTRY0("LATriggered",
+		   CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
+[32] =	FLAG_ENTRY0("CceSegReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
+[33] =	FLAG_ENTRY0("CceSegWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
+[34] =	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
+[36] =	FLAG_ENTRY0("CceMsixTableCorErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
+[37] =	FLAG_ENTRY0("CceMsixTableUncErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
+[38] =	FLAG_ENTRY0("CceIntMapCorErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
+[39] =	FLAG_ENTRY0("CceIntMapUncErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
+[40] =	FLAG_ENTRY0("CceMsixCsrParityErr",
+		   CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
 /*41-63 reserved*/
 };
 
@@ -342,128 +342,128 @@ static struct flag_table cce_err_status_flags[] = {
  */
 #define MES(text) MISC_ERR_STATUS_MISC_##text##_ERR_SMASK
 static struct flag_table misc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
-/* 3*/	FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
-/* 4*/	FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
-/* 5*/	FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
-/* 6*/	FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
-/* 7*/	FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
-/* 8*/	FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
-/* 9*/	FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
-/*10*/	FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
-/*11*/	FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
-/*12*/	FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
+	[0]  = FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
+	[1]  = FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
+	[2]  = FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
+	[3]  = FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
+	[4]  = FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
+	[5]  = FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
+	[6]  = FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
+	[7]  = FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
+	[8]  = FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
+	[9]  = FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
+	[10] = FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
+	[11] = FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
+	[12] = FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
 };
 
 /*
  * TXE PIO Error flags and consequences
  */
 static struct flag_table pio_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("PioWriteBadCtxt",
-	SEC_WRITE_DROPPED,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("PioWriteAddrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("PioCsrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("PioSbMemFifo0",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("PioSbMemFifo1",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
-/* 5*/	FLAG_ENTRY("PioPccFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY("PioPecFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY("PioSbrdctlCrrelParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY("PioPktEvictFifoParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY("PioSmPktResetParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY("PioVlLenMemBank0Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
-/*12*/	FLAG_ENTRY("PioVlLenMemBank1Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
-/*13*/	FLAG_ENTRY("PioVlLenMemBank0Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY("PioVlLenMemBank1Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY("PioCreditRetFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
-/*16*/	FLAG_ENTRY("PioPpmcPblFifo",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
-/*17*/	FLAG_ENTRY("PioInitSmIn",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
-/*18*/	FLAG_ENTRY("PioPktEvictSmOrArbSm",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
-/*19*/	FLAG_ENTRY("PioHostAddrMemUnc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
-/*20*/	FLAG_ENTRY("PioHostAddrMemCor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
-/*21*/	FLAG_ENTRY("PioWriteDataParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
-/*22*/	FLAG_ENTRY("PioStateMachine",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
-/*23*/	FLAG_ENTRY("PioWriteQwValidParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
-/*24*/	FLAG_ENTRY("PioBlockQwCountParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
-/*25*/	FLAG_ENTRY("PioVlfVlLenParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
-/*26*/	FLAG_ENTRY("PioVlfSopParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
-/*27*/	FLAG_ENTRY("PioVlFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY("PioPpmcBqcMemParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY("PioPpmcSopLen",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
+[0]  =	FLAG_ENTRY("PioWriteBadCtxt",
+	      SEC_WRITE_DROPPED,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
+[1]  =	FLAG_ENTRY("PioWriteAddrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY("PioCsrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
+[3]  =	FLAG_ENTRY("PioSbMemFifo0",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
+[4]  =	FLAG_ENTRY("PioSbMemFifo1",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
+[5]  =	FLAG_ENTRY("PioPccFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY("PioPecFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY("PioSbrdctlCrrelParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY("PioPktEvictFifoParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY("PioSmPktResetParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY("PioVlLenMemBank0Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
+[12] =	FLAG_ENTRY("PioVlLenMemBank1Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
+[13] =	FLAG_ENTRY("PioVlLenMemBank0Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY("PioVlLenMemBank1Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY("PioCreditRetFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
+[16] =	FLAG_ENTRY("PioPpmcPblFifo",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
+[17] =	FLAG_ENTRY("PioInitSmIn",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
+[18] =	FLAG_ENTRY("PioPktEvictSmOrArbSm",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
+[19] =	FLAG_ENTRY("PioHostAddrMemUnc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
+[20] =	FLAG_ENTRY("PioHostAddrMemCor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
+[21] =	FLAG_ENTRY("PioWriteDataParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
+[22] =	FLAG_ENTRY("PioStateMachine",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
+[23] =	FLAG_ENTRY("PioWriteQwValidParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
+[24] =	FLAG_ENTRY("PioBlockQwCountParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
+[25] =	FLAG_ENTRY("PioVlfVlLenParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
+[26] =	FLAG_ENTRY("PioVlfSopParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
+[27] =	FLAG_ENTRY("PioVlFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY("PioPpmcBqcMemParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY("PioPpmcSopLen",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
 /*30-31 reserved*/
-/*32*/	FLAG_ENTRY("PioCurrentFreeCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
-/*33*/	FLAG_ENTRY("PioLastReturnedCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
-/*34*/	FLAG_ENTRY("PioPccSopHeadParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY("PioPecSopHeadParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
+[32] =	FLAG_ENTRY("PioCurrentFreeCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
+[33] =	FLAG_ENTRY("PioLastReturnedCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
+[34] =	FLAG_ENTRY("PioPccSopHeadParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY("PioPecSopHeadParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
 /*36-63 reserved*/
 };
 
@@ -503,14 +503,14 @@ static struct flag_table pio_err_status_flags[] = {
  * TXE SDMA Error flags
  */
 static struct flag_table sdma_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SDmaRpyTagErr",
-		SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("SDmaCsrParityErr",
-		SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("SDmaRpyTagErr",
+		   SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("SDmaCsrParityErr",
+		   SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
 /*04-63 reserved*/
 };
 
@@ -531,100 +531,100 @@ static struct flag_table sdma_err_status_flags[] = {
  */
 #define SEES(text) SEND_EGRESS_ERR_STATUS_##text##_ERR_SMASK
 static struct flag_table egress_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
-/* 1*/	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
+[0]  =	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
+[1]  =	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
 /* 2 reserved */
-/* 3*/	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
-		SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
-/* 4*/	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
-/* 5*/	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
+[3]  =	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
+		   SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
+[4]  =	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
+[5]  =	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
 /* 6 reserved */
-/* 7*/	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
-		SEES(TX_PIO_LAUNCH_INTF_PARITY)),
-/* 8*/	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
-		SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
+[7]  =	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
+		   SEES(TX_PIO_LAUNCH_INTF_PARITY)),
+[8]  =	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
+		   SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
 /* 9-10 reserved */
-/*11*/	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
-		SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
-/*12*/	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
-/*13*/	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
-/*14*/	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
-/*15*/	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
-/*16*/	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
-		SEES(TX_SDMA0_DISALLOWED_PACKET)),
-/*17*/	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
-		SEES(TX_SDMA1_DISALLOWED_PACKET)),
-/*18*/	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
-		SEES(TX_SDMA2_DISALLOWED_PACKET)),
-/*19*/	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
-		SEES(TX_SDMA3_DISALLOWED_PACKET)),
-/*20*/	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
-		SEES(TX_SDMA4_DISALLOWED_PACKET)),
-/*21*/	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
-		SEES(TX_SDMA5_DISALLOWED_PACKET)),
-/*22*/	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
-		SEES(TX_SDMA6_DISALLOWED_PACKET)),
-/*23*/	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
-		SEES(TX_SDMA7_DISALLOWED_PACKET)),
-/*24*/	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
-		SEES(TX_SDMA8_DISALLOWED_PACKET)),
-/*25*/	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
-		SEES(TX_SDMA9_DISALLOWED_PACKET)),
-/*26*/	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
-		SEES(TX_SDMA10_DISALLOWED_PACKET)),
-/*27*/	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
-		SEES(TX_SDMA11_DISALLOWED_PACKET)),
-/*28*/	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
-		SEES(TX_SDMA12_DISALLOWED_PACKET)),
-/*29*/	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
-		SEES(TX_SDMA13_DISALLOWED_PACKET)),
-/*30*/	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
-		SEES(TX_SDMA14_DISALLOWED_PACKET)),
-/*31*/	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
-		SEES(TX_SDMA15_DISALLOWED_PACKET)),
-/*32*/	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
-/*33*/	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
-/*34*/	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
-/*35*/	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
-/*36*/	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
-/*37*/	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
-/*38*/	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
-/*39*/	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
-/*40*/	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
-/*41*/	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
-/*42*/	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
-/*43*/	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
-/*44*/	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
-/*45*/	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
-/*46*/	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
-/*47*/	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
-/*48*/	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
-/*49*/	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
-/*50*/	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
-/*51*/	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
-/*52*/	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
-/*53*/	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
-/*54*/	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
-/*55*/	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
-/*56*/	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
-/*57*/	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
-/*58*/	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
-/*59*/	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
-/*60*/	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
-/*61*/	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
-/*62*/	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
-		SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
-/*63*/	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
-		SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
+[11] =	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
+		   SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
+[12] =	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
+[13] =	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
+[14] =	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
+[15] =	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
+[16] =	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
+		   SEES(TX_SDMA0_DISALLOWED_PACKET)),
+[17] =	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
+		   SEES(TX_SDMA1_DISALLOWED_PACKET)),
+[18] =	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
+		   SEES(TX_SDMA2_DISALLOWED_PACKET)),
+[19] =	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
+		   SEES(TX_SDMA3_DISALLOWED_PACKET)),
+[20] =	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
+		   SEES(TX_SDMA4_DISALLOWED_PACKET)),
+[21] =	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
+		   SEES(TX_SDMA5_DISALLOWED_PACKET)),
+[22] =	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
+		   SEES(TX_SDMA6_DISALLOWED_PACKET)),
+[23] =	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
+		   SEES(TX_SDMA7_DISALLOWED_PACKET)),
+[24] =	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
+		   SEES(TX_SDMA8_DISALLOWED_PACKET)),
+[25] =	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
+		   SEES(TX_SDMA9_DISALLOWED_PACKET)),
+[26] =	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
+		   SEES(TX_SDMA10_DISALLOWED_PACKET)),
+[27] =	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
+		   SEES(TX_SDMA11_DISALLOWED_PACKET)),
+[28] =	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
+		   SEES(TX_SDMA12_DISALLOWED_PACKET)),
+[29] =	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
+		   SEES(TX_SDMA13_DISALLOWED_PACKET)),
+[30] =	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
+		   SEES(TX_SDMA14_DISALLOWED_PACKET)),
+[31] =	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
+		   SEES(TX_SDMA15_DISALLOWED_PACKET)),
+[32] =	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
+[33] =	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
+[34] =	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
+[35] =	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
+[36] =	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
+[37] =	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
+[38] =	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
+[39] =	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
+[40] =	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
+[41] =	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
+[42] =	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
+[43] =	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
+[44] =	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
+[45] =	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
+[46] =	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
+[47] =	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
+[48] =	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
+[49] =	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
+[50] =	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
+[51] =	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
+[52] =	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
+[53] =	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
+[54] =	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
+[55] =	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
+[56] =	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
+[57] =	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
+[58] =	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
+[59] =	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
+[60] =	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
+[61] =	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
+[62] =	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
+		   SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
+[63] =	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
+		   SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
 };
 
 /*
@@ -632,28 +632,28 @@ static struct flag_table egress_err_status_flags[] = {
  */
 #define SEEI(text) SEND_EGRESS_ERR_INFO_##text##_ERR_SMASK
 static struct flag_table egress_err_info_flags[] = {
-/* 0*/	FLAG_ENTRY0("Reserved", 0ull),
-/* 1*/	FLAG_ENTRY0("VLErr", SEEI(VL)),
-/* 2*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 3*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 4*/	FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
-/* 5*/	FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
-/* 6*/	FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
-/* 7*/	FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
-/* 8*/	FLAG_ENTRY0("RawErr", SEEI(RAW)),
-/* 9*/	FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
-/*10*/	FLAG_ENTRY0("GRHErr", SEEI(GRH)),
-/*11*/	FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
-/*12*/	FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
-/*13*/	FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
-/*14*/	FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
-/*15*/	FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
-/*16*/	FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
-/*17*/	FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
-/*18*/	FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
-/*19*/	FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
-/*20*/	FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
-/*21*/	FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
+[0]  = FLAG_ENTRY0("Reserved", 0ull),
+[1]  = FLAG_ENTRY0("VLErr", SEEI(VL)),
+[2]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[3]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[4]  = FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
+[5]  = FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
+[6]  = FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
+[7]  = FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
+[8]  = FLAG_ENTRY0("RawErr", SEEI(RAW)),
+[9]  = FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
+[10] = FLAG_ENTRY0("GRHErr", SEEI(GRH)),
+[11] = FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
+[12] = FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
+[13] = FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
+[14] = FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
+[15] = FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
+[16] = FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
+[17] = FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
+[18] = FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
+[19] = FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
+[20] = FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
+[21] = FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
 };
 
 /* TXE Egress errors that cause an SPC freeze */
@@ -681,28 +681,28 @@ static struct flag_table egress_err_info_flags[] = {
  */
 #define SES(name) SEND_ERR_STATUS_SEND_##name##_ERR_SMASK
 static struct flag_table send_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
+[0] = FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
+[1] = FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
+[2] = FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
 };
 
 /*
  * TXE Send Context Error flags and consequences
  */
 static struct flag_table sc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("InconsistentSop",
+[0] =	FLAG_ENTRY("InconsistentSop",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_INCONSISTENT_SOP_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("DisallowedPacket",
+[1] =	FLAG_ENTRY("DisallowedPacket",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_DISALLOWED_PACKET_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("WriteCrossesBoundary",
+[2] =	FLAG_ENTRY("WriteCrossesBoundary",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_CROSSES_BOUNDARY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("WriteOverflow",
+[3] =	FLAG_ENTRY("WriteOverflow",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OVERFLOW_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("WriteOutOfBounds",
+[4] =	FLAG_ENTRY("WriteOutOfBounds",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OUT_OF_BOUNDS_ERR_SMASK),
 /* 5-63 reserved*/
@@ -713,82 +713,82 @@ static struct flag_table sc_err_status_flags[] = {
  */
 #define RXES(name) RCV_ERR_STATUS_RX_##name##_ERR_SMASK
 static struct flag_table rxe_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
-/* 1*/	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
-/* 2*/	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
-/* 3*/	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
-/* 4*/	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
-/* 5*/	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
-/* 6*/	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
-/* 7*/	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
-/* 8*/	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
-/* 9*/	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
-/*10*/	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
-/*11*/	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
-/*12*/	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
-/*13*/	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
-/*14*/	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
-/*15*/	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
-/*16*/	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
-		RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
-/*17*/	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
-/*18*/	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
-/*19*/	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
-		RXES(RBUF_BLOCK_LIST_READ_UNC)),
-/*20*/	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
-		RXES(RBUF_BLOCK_LIST_READ_COR)),
-/*21*/	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
-		RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
-/*22*/	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
-		RXES(RBUF_CSR_QENT_CNT_PARITY)),
-/*23*/	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
-		RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
-/*24*/	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
-		RXES(RBUF_CSR_QVLD_BIT_PARITY)),
-/*25*/	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
-/*26*/	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
-/*27*/	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
-		RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
-/*28*/	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
-/*29*/	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
-/*30*/	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
-/*31*/	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
-/*32*/	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
-/*33*/	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
-/*34*/	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
-/*35*/	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
-		RXES(RBUF_FL_INITDONE_PARITY)),
-/*36*/	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
-		RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
-/*37*/	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
-/*38*/	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
-/*39*/	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
-/*40*/	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
-		RXES(LOOKUP_DES_PART1_UNC_COR)),
-/*41*/	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
-		RXES(LOOKUP_DES_PART2_PARITY)),
-/*42*/	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
-/*43*/	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
-/*44*/	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
-/*45*/	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
-/*46*/	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
-/*47*/	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
-/*48*/	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
-/*49*/	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
-/*50*/	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
-/*51*/	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
-/*52*/	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
-/*53*/	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
-/*54*/	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
-/*55*/	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
-/*56*/	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
-/*57*/	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
-/*58*/	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
-/*59*/	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
-/*60*/	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
-/*61*/	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
-/*62*/	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
-/*63*/	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
+[0]  =	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
+[1]  =	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
+[2]  =	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
+[3]  =	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
+[4]  =	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
+[5]  =	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
+[6]  =	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
+[7]  =	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
+[8]  =	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
+[9]  =	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
+[10] =	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
+[11] =	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
+[12] =	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
+[13] =	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
+[14] =	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
+[15] =	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
+[16] =	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
+		   RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
+[17] =	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
+[18] =	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
+[19] =	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
+		   RXES(RBUF_BLOCK_LIST_READ_UNC)),
+[20] =	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
+		   RXES(RBUF_BLOCK_LIST_READ_COR)),
+[21] =	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
+		   RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
+[22] =	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
+		   RXES(RBUF_CSR_QENT_CNT_PARITY)),
+[23] =	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
+		   RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
+[24] =	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
+		   RXES(RBUF_CSR_QVLD_BIT_PARITY)),
+[25] =	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
+[26] =	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
+[27] =	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
+		   RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
+[28] =	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
+[29] =	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
+[30] =	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
+[31] =	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
+[32] =	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
+[33] =	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
+[34] =	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
+[35] =	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
+		   RXES(RBUF_FL_INITDONE_PARITY)),
+[36] =	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
+		   RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
+[37] =	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
+[38] =	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
+[39] =	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
+[40] =	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
+		   RXES(LOOKUP_DES_PART1_UNC_COR)),
+[41] =	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
+		   RXES(LOOKUP_DES_PART2_PARITY)),
+[42] =	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
+[43] =	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
+[44] =	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
+[45] =	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
+[46] =	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
+[47] =	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
+[48] =	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
+[49] =	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
+[50] =	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
+[51] =	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
+[52] =	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
+[53] =	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
+[54] =	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
+[55] =	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
+[56] =	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
+[57] =	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
+[58] =	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
+[59] =	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
+[60] =	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
+[61] =	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
+[62] =	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
+[63] =	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
 };
 
 /* RXE errors that will trigger an SPC freeze */
@@ -901,42 +901,42 @@ static struct flag_table dcc_err_flags[] = {
  */
 #define LCBE(name) DC_LCB_ERR_FLG_##name##_SMASK
 static struct flag_table lcb_err_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
-/* 1*/	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
-/* 2*/	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
-/* 3*/	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
-		LCBE(ALL_LNS_FAILED_REINIT_TEST)),
-/* 4*/	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
-/* 5*/	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
-/* 6*/	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
-/* 7*/	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
-/* 8*/	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
-/* 9*/	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
-/*10*/	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
-/*11*/	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
-/*12*/	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
-/*13*/	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
-		LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
-/*14*/	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
-/*15*/	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
-/*16*/	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
-/*17*/	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
-/*18*/	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
-/*19*/	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
-		LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
-/*20*/	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
-/*21*/	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
-/*22*/	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
-/*23*/	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
-/*24*/	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
-/*25*/	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
-/*26*/	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
-		LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
-/*27*/	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
-/*28*/	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
-		LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
-/*29*/	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
-		LCBE(REDUNDANT_FLIT_PARITY_ERR))
+[0]  =	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
+[1]  =	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
+[2]  =	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
+[3]  =	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
+		   LCBE(ALL_LNS_FAILED_REINIT_TEST)),
+[4]  =	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
+[5]  =	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
+[6]  =	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
+[7]  =	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
+[8]  =	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
+[9]  =	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
+[10] =	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
+[11] =	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
+[12] =	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
+[13] =	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
+		   LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
+[14] =	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
+[15] =	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
+[16] =	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
+[17] =	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
+[18] =	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
+[19] =	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
+		   LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
+[20] =	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
+[21] =	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
+[22] =	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
+[23] =	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
+[24] =	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
+[25] =	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
+[26] =	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
+		   LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
+[27] =	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
+[28] =	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
+		   LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
+[29] =	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
+		   LCBE(REDUNDANT_FLIT_PARITY_ERR))
 };
 
 /*
@@ -1098,14 +1098,14 @@ struct err_reg_info {
  * another register containing more information.
  */
 static const struct err_reg_info misc_errs[NUM_MISC_ERRS] = {
-/* 0*/	EE(CCE_ERR,		handle_cce_err,    "CceErr"),
-/* 1*/	EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
-/* 2*/	EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
-/* 3*/	{ 0, 0, 0, NULL }, /* reserved */
-/* 4*/	EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
-/* 5*/	EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
-/* 6*/	EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
-/* 7*/	EE(SEND_ERR,	handle_txe_err,    "TxeErr")
+	[0] = EE(CCE_ERR,		handle_cce_err,    "CceErr"),
+	[1] = EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
+	[2] = EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
+	[3] = { 0, 0, 0, NULL }, /* reserved */
+	[4] = EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
+	[5] = EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
+	[6] = EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
+	[7] = EE(SEND_ERR,	handle_txe_err,    "TxeErr")
 	/* the rest are reserved */
 };
 
@@ -1123,11 +1123,11 @@ static const struct err_reg_info sdma_eng_err =
 	EE(SEND_DMA_ENG_ERR, handle_sdma_eng_err, "SDmaEngErr");
 
 static const struct err_reg_info various_err[NUM_VARIOUS] = {
-/* 0*/	{ 0, 0, 0, NULL }, /* PbcInt */
-/* 1*/	{ 0, 0, 0, NULL }, /* GpioAssertInt */
-/* 2*/	EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
-/* 3*/	EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
-/* 4*/	{ 0, 0, 0, NULL }, /* TCritInt */
+	[0] = { 0, 0, 0, NULL }, /* PbcInt */
+	[1] = { 0, 0, 0, NULL }, /* GpioAssertInt */
+	[2] = EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
+	[3] = EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
+	[4] = { 0, 0, 0, NULL }, /* TCritInt */
 	/* rest are reserved */
 };
 
@@ -5317,14 +5317,14 @@ static char *flag_string(char *buf, int buf_len, u64 flags,
 
 /* first 8 CCE error interrupt source names */
 static const char * const cce_misc_names[] = {
-	"CceErrInt",		/* 0 */
-	"RxeErrInt",		/* 1 */
-	"MiscErrInt",		/* 2 */
-	"Reserved3",		/* 3 */
-	"PioErrInt",		/* 4 */
-	"SDmaErrInt",		/* 5 */
-	"EgressErrInt",		/* 6 */
-	"TxeErrInt"		/* 7 */
+	[0] = "CceErrInt",
+	[1] = "RxeErrInt",
+	[2] = "MiscErrInt",
+	[3] = "Reserved3",
+	[4] = "PioErrInt",
+	[5] = "SDmaErrInt",
+	[6] = "EgressErrInt",
+	[7] = "TxeErrInt"
 };
 
 /*
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 4146a2113a95..a5cc1979b73a 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -1065,17 +1065,17 @@ static const struct {
 	u8 allowed[__N_PHYSTATES][__N_PHYSTATES];
 } physical_state_transitions = {
 	{
-		/* 2    3    4    5    6    7    8    9   10   11 */
-	/* 2 */	{ __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
-	/* 3 */	{ __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
-	/* 4 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 5 */	{ __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
-	/* 6 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 7 */	{ __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
-	/* 8 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 9 */	{ __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
-	/*10 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/*11 */	{ __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
+		     /* 2    3    4    5    6    7    8    9   10   11 */
+	[2]  = { __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
+	[3]  = { __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
+	[4]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[5]  = { __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
+	[6]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[7]  = { __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
+	[8]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[9]  = { __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
+	[10] = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[11] = { __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
 	}
 };
 
@@ -1096,12 +1096,12 @@ static const struct {
 	u8 allowed[__N_LOGICAL_STATES][__N_LOGICAL_STATES];
 } logical_state_transitions = {
 	{
-		/* 1    2    3    4    5 */
-	/* 1 */	{ __I, __D, __D, __D, __U},
-	/* 2 */	{ __D, __I, __A, __D, __U},
-	/* 3 */	{ __D, __D, __I, __A, __U},
-	/* 4 */	{ __D, __D, __I, __I, __U},
-	/* 5 */	{ __U, __U, __U, __U, __U},
+		     /* 1    2    3    4    5 */
+	[1] = { __I, __D, __D, __D, __U},
+	[2] = { __D, __I, __A, __D, __U},
+	[3] = { __D, __D, __I, __A, __U},
+	[4] = { __D, __D, __I, __I, __U},
+	[5] = { __U, __U, __U, __U, __U},
 	}
 };
 
-- 
2.35.1

[PATCH 10/22] hfi1: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/hw/hfi1/chip.c | 918 +++++++++++++++---------------
 drivers/infiniband/hw/hfi1/mad.c  |  34 +-
 2 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index f1245c94ae26..e9b8a7220f5d 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -252,88 +252,88 @@ struct flag_table {
  * CCE Error flags.
  */
 static struct flag_table cce_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CceCsrParityErr",
-		CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("CceCsrReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 4*/	FLAG_ENTRY0("CceTrgtAccessErr",
-		CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
-/* 5*/	FLAG_ENTRY0("CceRspdDataParityErr",
-		CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY0("CceCsrCfgBusParityErr",
-		CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
-	    CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
-/*12*/	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
-		CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
-/*13*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY0("PcicRetryMemCorErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
-/*16*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
-/*17*/	FLAG_ENTRY0("PcicPostHdQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
-/*18*/	FLAG_ENTRY0("PcicCplDatQCorErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
-/*19*/	FLAG_ENTRY0("PcicNPostHQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
-/*20*/	FLAG_ENTRY0("PcicNPostDatQParityErr",
-		CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
-/*21*/	FLAG_ENTRY0("PcicRetryMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
-/*22*/	FLAG_ENTRY0("PcicRetrySotMemUncErr",
-		CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
-/*23*/	FLAG_ENTRY0("PcicPostHdQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
-/*24*/	FLAG_ENTRY0("PcicPostDatQUncErr",
-		CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
-/*25*/	FLAG_ENTRY0("PcicCplHdQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
-/*26*/	FLAG_ENTRY0("PcicCplDatQUncErr",
-		CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
-/*27*/	FLAG_ENTRY0("PcicTransmitFrontParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY0("PcicTransmitBackParityErr",
-		CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY0("PcicReceiveParityErr",
-		CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
-/*30*/	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
-		CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
-/*31*/	FLAG_ENTRY0("LATriggered",
-		CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
-/*32*/	FLAG_ENTRY0("CceSegReadBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
-/*33*/	FLAG_ENTRY0("CceSegWriteBadAddrErr",
-		CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
-/*34*/	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
-		CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
-		CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
-/*36*/	FLAG_ENTRY0("CceMsixTableCorErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
-/*37*/	FLAG_ENTRY0("CceMsixTableUncErr",
-		CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
-/*38*/	FLAG_ENTRY0("CceIntMapCorErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
-/*39*/	FLAG_ENTRY0("CceIntMapUncErr",
-		CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
-/*40*/	FLAG_ENTRY0("CceMsixCsrParityErr",
-		CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("CceCsrParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_PARITY_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("CceCsrReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_READ_BAD_ADDR_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("CceCsrWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_CSR_WRITE_BAD_ADDR_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("CceTrgtAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ASYNC_FIFO_PARITY_ERR_SMASK),
+[4]  =	FLAG_ENTRY0("CceTrgtAccessErr",
+		   CCE_ERR_STATUS_CCE_TRGT_ACCESS_ERR_SMASK),
+[5]  =	FLAG_ENTRY0("CceRspdDataParityErr",
+		   CCE_ERR_STATUS_CCE_RSPD_DATA_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY0("CceCli0AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI0_ASYNC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY0("CceCsrCfgBusParityErr",
+		   CCE_ERR_STATUS_CCE_CSR_CFG_BUS_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY0("CceCli2AsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_CLI2_ASYNC_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_PIO_CRDT_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY0("CceCli1AsyncFifoPioCrdtParityErr",
+	      CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_SDMA_HD_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY0("CceCli1AsyncFifoRxdmaParityError",
+	       CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_RXDMA_PARITY_ERROR_SMASK),
+[12] =	FLAG_ENTRY0("CceCli1AsyncFifoDbgParityError",
+		   CCE_ERR_STATUS_CCE_CLI1_ASYNC_FIFO_DBG_PARITY_ERROR_SMASK),
+[13] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY0("PcicRetryMemCorErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QCOR_ERR_SMASK),
+[16] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QCOR_ERR_SMASK),
+[17] =	FLAG_ENTRY0("PcicPostHdQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QCOR_ERR_SMASK),
+[18] =	FLAG_ENTRY0("PcicCplDatQCorErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QCOR_ERR_SMASK),
+[19] =	FLAG_ENTRY0("PcicNPostHQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_HQ_PARITY_ERR_SMASK),
+[20] =	FLAG_ENTRY0("PcicNPostDatQParityErr",
+		   CCE_ERR_STATUS_PCIC_NPOST_DAT_QPARITY_ERR_SMASK),
+[21] =	FLAG_ENTRY0("PcicRetryMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_MEM_UNC_ERR_SMASK),
+[22] =	FLAG_ENTRY0("PcicRetrySotMemUncErr",
+		   CCE_ERR_STATUS_PCIC_RETRY_SOT_MEM_UNC_ERR_SMASK),
+[23] =	FLAG_ENTRY0("PcicPostHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_HD_QUNC_ERR_SMASK),
+[24] =	FLAG_ENTRY0("PcicPostDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_POST_DAT_QUNC_ERR_SMASK),
+[25] =	FLAG_ENTRY0("PcicCplHdQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_HD_QUNC_ERR_SMASK),
+[26] =	FLAG_ENTRY0("PcicCplDatQUncErr",
+		   CCE_ERR_STATUS_PCIC_CPL_DAT_QUNC_ERR_SMASK),
+[27] =	FLAG_ENTRY0("PcicTransmitFrontParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_FRONT_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY0("PcicTransmitBackParityErr",
+		   CCE_ERR_STATUS_PCIC_TRANSMIT_BACK_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY0("PcicReceiveParityErr",
+		   CCE_ERR_STATUS_PCIC_RECEIVE_PARITY_ERR_SMASK),
+[30] =	FLAG_ENTRY0("CceTrgtCplTimeoutErr",
+		   CCE_ERR_STATUS_CCE_TRGT_CPL_TIMEOUT_ERR_SMASK),
+[31] =	FLAG_ENTRY0("LATriggered",
+		   CCE_ERR_STATUS_LA_TRIGGERED_SMASK),
+[32] =	FLAG_ENTRY0("CceSegReadBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_READ_BAD_ADDR_ERR_SMASK),
+[33] =	FLAG_ENTRY0("CceSegWriteBadAddrErr",
+		   CCE_ERR_STATUS_CCE_SEG_WRITE_BAD_ADDR_ERR_SMASK),
+[34] =	FLAG_ENTRY0("CceRcplAsyncFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RCPL_ASYNC_FIFO_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY0("CceRxdmaConvFifoParityErr",
+		   CCE_ERR_STATUS_CCE_RXDMA_CONV_FIFO_PARITY_ERR_SMASK),
+[36] =	FLAG_ENTRY0("CceMsixTableCorErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_COR_ERR_SMASK),
+[37] =	FLAG_ENTRY0("CceMsixTableUncErr",
+		   CCE_ERR_STATUS_CCE_MSIX_TABLE_UNC_ERR_SMASK),
+[38] =	FLAG_ENTRY0("CceIntMapCorErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_COR_ERR_SMASK),
+[39] =	FLAG_ENTRY0("CceIntMapUncErr",
+		   CCE_ERR_STATUS_CCE_INT_MAP_UNC_ERR_SMASK),
+[40] =	FLAG_ENTRY0("CceMsixCsrParityErr",
+		   CCE_ERR_STATUS_CCE_MSIX_CSR_PARITY_ERR_SMASK),
 /*41-63 reserved*/
 };
 
@@ -342,128 +342,128 @@ static struct flag_table cce_err_status_flags[] = {
  */
 #define MES(text) MISC_ERR_STATUS_MISC_##text##_ERR_SMASK
 static struct flag_table misc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
-/* 3*/	FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
-/* 4*/	FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
-/* 5*/	FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
-/* 6*/	FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
-/* 7*/	FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
-/* 8*/	FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
-/* 9*/	FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
-/*10*/	FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
-/*11*/	FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
-/*12*/	FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
+	[0]  = FLAG_ENTRY0("CSR_PARITY", MES(CSR_PARITY)),
+	[1]  = FLAG_ENTRY0("CSR_READ_BAD_ADDR", MES(CSR_READ_BAD_ADDR)),
+	[2]  = FLAG_ENTRY0("CSR_WRITE_BAD_ADDR", MES(CSR_WRITE_BAD_ADDR)),
+	[3]  = FLAG_ENTRY0("SBUS_WRITE_FAILED", MES(SBUS_WRITE_FAILED)),
+	[4]  = FLAG_ENTRY0("KEY_MISMATCH", MES(KEY_MISMATCH)),
+	[5]  = FLAG_ENTRY0("FW_AUTH_FAILED", MES(FW_AUTH_FAILED)),
+	[6]  = FLAG_ENTRY0("EFUSE_CSR_PARITY", MES(EFUSE_CSR_PARITY)),
+	[7]  = FLAG_ENTRY0("EFUSE_READ_BAD_ADDR", MES(EFUSE_READ_BAD_ADDR)),
+	[8]  = FLAG_ENTRY0("EFUSE_WRITE", MES(EFUSE_WRITE)),
+	[9]  = FLAG_ENTRY0("EFUSE_DONE_PARITY", MES(EFUSE_DONE_PARITY)),
+	[10] = FLAG_ENTRY0("INVALID_EEP_CMD", MES(INVALID_EEP_CMD)),
+	[11] = FLAG_ENTRY0("MBIST_FAIL", MES(MBIST_FAIL)),
+	[12] = FLAG_ENTRY0("PLL_LOCK_FAIL", MES(PLL_LOCK_FAIL))
 };
 
 /*
  * TXE PIO Error flags and consequences
  */
 static struct flag_table pio_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("PioWriteBadCtxt",
-	SEC_WRITE_DROPPED,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("PioWriteAddrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("PioCsrParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("PioSbMemFifo0",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("PioSbMemFifo1",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
-/* 5*/	FLAG_ENTRY("PioPccFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
-/* 6*/	FLAG_ENTRY("PioPecFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
-/* 7*/	FLAG_ENTRY("PioSbrdctlCrrelParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
-/* 8*/	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
-/* 9*/	FLAG_ENTRY("PioPktEvictFifoParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
-/*10*/	FLAG_ENTRY("PioSmPktResetParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
-/*11*/	FLAG_ENTRY("PioVlLenMemBank0Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
-/*12*/	FLAG_ENTRY("PioVlLenMemBank1Unc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
-/*13*/	FLAG_ENTRY("PioVlLenMemBank0Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
-/*14*/	FLAG_ENTRY("PioVlLenMemBank1Cor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
-/*15*/	FLAG_ENTRY("PioCreditRetFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
-/*16*/	FLAG_ENTRY("PioPpmcPblFifo",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
-/*17*/	FLAG_ENTRY("PioInitSmIn",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
-/*18*/	FLAG_ENTRY("PioPktEvictSmOrArbSm",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
-/*19*/	FLAG_ENTRY("PioHostAddrMemUnc",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
-/*20*/	FLAG_ENTRY("PioHostAddrMemCor",
-	0,
-	SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
-/*21*/	FLAG_ENTRY("PioWriteDataParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
-/*22*/	FLAG_ENTRY("PioStateMachine",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
-/*23*/	FLAG_ENTRY("PioWriteQwValidParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
-/*24*/	FLAG_ENTRY("PioBlockQwCountParity",
-	SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
-/*25*/	FLAG_ENTRY("PioVlfVlLenParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
-/*26*/	FLAG_ENTRY("PioVlfSopParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
-/*27*/	FLAG_ENTRY("PioVlFifoParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
-/*28*/	FLAG_ENTRY("PioPpmcBqcMemParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
-/*29*/	FLAG_ENTRY("PioPpmcSopLen",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
+[0]  =	FLAG_ENTRY("PioWriteBadCtxt",
+	      SEC_WRITE_DROPPED,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_BAD_CTXT_ERR_SMASK),
+[1]  =	FLAG_ENTRY("PioWriteAddrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_ADDR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY("PioCsrParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CSR_PARITY_ERR_SMASK),
+[3]  =	FLAG_ENTRY("PioSbMemFifo0",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO0_ERR_SMASK),
+[4]  =	FLAG_ENTRY("PioSbMemFifo1",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SB_MEM_FIFO1_ERR_SMASK),
+[5]  =	FLAG_ENTRY("PioPccFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_FIFO_PARITY_ERR_SMASK),
+[6]  =	FLAG_ENTRY("PioPecFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_FIFO_PARITY_ERR_SMASK),
+[7]  =	FLAG_ENTRY("PioSbrdctlCrrelParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTL_CRREL_PARITY_ERR_SMASK),
+[8]  =	FLAG_ENTRY("PioSbrdctrlCrrelFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SBRDCTRL_CRREL_FIFO_PARITY_ERR_SMASK),
+[9]  =	FLAG_ENTRY("PioPktEvictFifoParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_FIFO_PARITY_ERR_SMASK),
+[10] =	FLAG_ENTRY("PioSmPktResetParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_SM_PKT_RESET_PARITY_ERR_SMASK),
+[11] =	FLAG_ENTRY("PioVlLenMemBank0Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_UNC_ERR_SMASK),
+[12] =	FLAG_ENTRY("PioVlLenMemBank1Unc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_UNC_ERR_SMASK),
+[13] =	FLAG_ENTRY("PioVlLenMemBank0Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK0_COR_ERR_SMASK),
+[14] =	FLAG_ENTRY("PioVlLenMemBank1Cor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_VL_LEN_MEM_BANK1_COR_ERR_SMASK),
+[15] =	FLAG_ENTRY("PioCreditRetFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CREDIT_RET_FIFO_PARITY_ERR_SMASK),
+[16] =	FLAG_ENTRY("PioPpmcPblFifo",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_PBL_FIFO_ERR_SMASK),
+[17] =	FLAG_ENTRY("PioInitSmIn",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_INIT_SM_IN_ERR_SMASK),
+[18] =	FLAG_ENTRY("PioPktEvictSmOrArbSm",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PKT_EVICT_SM_OR_ARB_SM_ERR_SMASK),
+[19] =	FLAG_ENTRY("PioHostAddrMemUnc",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_UNC_ERR_SMASK),
+[20] =	FLAG_ENTRY("PioHostAddrMemCor",
+	      0,
+	      SEND_PIO_ERR_STATUS_PIO_HOST_ADDR_MEM_COR_ERR_SMASK),
+[21] =	FLAG_ENTRY("PioWriteDataParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_DATA_PARITY_ERR_SMASK),
+[22] =	FLAG_ENTRY("PioStateMachine",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_STATE_MACHINE_ERR_SMASK),
+[23] =	FLAG_ENTRY("PioWriteQwValidParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_WRITE_QW_VALID_PARITY_ERR_SMASK),
+[24] =	FLAG_ENTRY("PioBlockQwCountParity",
+	      SEC_WRITE_DROPPED | SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_BLOCK_QW_COUNT_PARITY_ERR_SMASK),
+[25] =	FLAG_ENTRY("PioVlfVlLenParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_VL_LEN_PARITY_ERR_SMASK),
+[26] =	FLAG_ENTRY("PioVlfSopParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VLF_SOP_PARITY_ERR_SMASK),
+[27] =	FLAG_ENTRY("PioVlFifoParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_VL_FIFO_PARITY_ERR_SMASK),
+[28] =	FLAG_ENTRY("PioPpmcBqcMemParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_BQC_MEM_PARITY_ERR_SMASK),
+[29] =	FLAG_ENTRY("PioPpmcSopLen",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PPMC_SOP_LEN_ERR_SMASK),
 /*30-31 reserved*/
-/*32*/	FLAG_ENTRY("PioCurrentFreeCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
-/*33*/	FLAG_ENTRY("PioLastReturnedCntParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
-/*34*/	FLAG_ENTRY("PioPccSopHeadParity",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
-/*35*/	FLAG_ENTRY("PioPecSopHeadParityErr",
-	SEC_SPC_FREEZE,
-	SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
+[32] =	FLAG_ENTRY("PioCurrentFreeCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_CURRENT_FREE_CNT_PARITY_ERR_SMASK),
+[33] =	FLAG_ENTRY("PioLastReturnedCntParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_LAST_RETURNED_CNT_PARITY_ERR_SMASK),
+[34] =	FLAG_ENTRY("PioPccSopHeadParity",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PCC_SOP_HEAD_PARITY_ERR_SMASK),
+[35] =	FLAG_ENTRY("PioPecSopHeadParityErr",
+	      SEC_SPC_FREEZE,
+	      SEND_PIO_ERR_STATUS_PIO_PEC_SOP_HEAD_PARITY_ERR_SMASK),
 /*36-63 reserved*/
 };
 
@@ -503,14 +503,14 @@ static struct flag_table pio_err_status_flags[] = {
  * TXE SDMA Error flags
  */
 static struct flag_table sdma_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SDmaRpyTagErr",
-		SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
-/* 1*/	FLAG_ENTRY0("SDmaCsrParityErr",
-		SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
-/* 2*/	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
-/* 3*/	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
-		SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
+[0]  =	FLAG_ENTRY0("SDmaRpyTagErr",
+		   SEND_DMA_ERR_STATUS_SDMA_RPY_TAG_ERR_SMASK),
+[1]  =	FLAG_ENTRY0("SDmaCsrParityErr",
+		   SEND_DMA_ERR_STATUS_SDMA_CSR_PARITY_ERR_SMASK),
+[2]  =	FLAG_ENTRY0("SDmaPcieReqTrackingUncErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_UNC_ERR_SMASK),
+[3]  =	FLAG_ENTRY0("SDmaPcieReqTrackingCorErr",
+		   SEND_DMA_ERR_STATUS_SDMA_PCIE_REQ_TRACKING_COR_ERR_SMASK),
 /*04-63 reserved*/
 };
 
@@ -531,100 +531,100 @@ static struct flag_table sdma_err_status_flags[] = {
  */
 #define SEES(text) SEND_EGRESS_ERR_STATUS_##text##_ERR_SMASK
 static struct flag_table egress_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
-/* 1*/	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
+[0]  =	FLAG_ENTRY0("TxPktIntegrityMemCorErr", SEES(TX_PKT_INTEGRITY_MEM_COR)),
+[1]  =	FLAG_ENTRY0("TxPktIntegrityMemUncErr", SEES(TX_PKT_INTEGRITY_MEM_UNC)),
 /* 2 reserved */
-/* 3*/	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
-		SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
-/* 4*/	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
-/* 5*/	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
+[3]  =	FLAG_ENTRY0("TxEgressFifoUnderrunOrParityErr",
+		   SEES(TX_EGRESS_FIFO_UNDERRUN_OR_PARITY)),
+[4]  =	FLAG_ENTRY0("TxLinkdownErr", SEES(TX_LINKDOWN)),
+[5]  =	FLAG_ENTRY0("TxIncorrectLinkStateErr", SEES(TX_INCORRECT_LINK_STATE)),
 /* 6 reserved */
-/* 7*/	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
-		SEES(TX_PIO_LAUNCH_INTF_PARITY)),
-/* 8*/	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
-		SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
+[7]  =	FLAG_ENTRY0("TxPioLaunchIntfParityErr",
+		   SEES(TX_PIO_LAUNCH_INTF_PARITY)),
+[8]  =	FLAG_ENTRY0("TxSdmaLaunchIntfParityErr",
+		   SEES(TX_SDMA_LAUNCH_INTF_PARITY)),
 /* 9-10 reserved */
-/*11*/	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
-		SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
-/*12*/	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
-/*13*/	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
-/*14*/	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
-/*15*/	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
-/*16*/	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
-		SEES(TX_SDMA0_DISALLOWED_PACKET)),
-/*17*/	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
-		SEES(TX_SDMA1_DISALLOWED_PACKET)),
-/*18*/	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
-		SEES(TX_SDMA2_DISALLOWED_PACKET)),
-/*19*/	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
-		SEES(TX_SDMA3_DISALLOWED_PACKET)),
-/*20*/	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
-		SEES(TX_SDMA4_DISALLOWED_PACKET)),
-/*21*/	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
-		SEES(TX_SDMA5_DISALLOWED_PACKET)),
-/*22*/	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
-		SEES(TX_SDMA6_DISALLOWED_PACKET)),
-/*23*/	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
-		SEES(TX_SDMA7_DISALLOWED_PACKET)),
-/*24*/	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
-		SEES(TX_SDMA8_DISALLOWED_PACKET)),
-/*25*/	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
-		SEES(TX_SDMA9_DISALLOWED_PACKET)),
-/*26*/	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
-		SEES(TX_SDMA10_DISALLOWED_PACKET)),
-/*27*/	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
-		SEES(TX_SDMA11_DISALLOWED_PACKET)),
-/*28*/	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
-		SEES(TX_SDMA12_DISALLOWED_PACKET)),
-/*29*/	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
-		SEES(TX_SDMA13_DISALLOWED_PACKET)),
-/*30*/	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
-		SEES(TX_SDMA14_DISALLOWED_PACKET)),
-/*31*/	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
-		SEES(TX_SDMA15_DISALLOWED_PACKET)),
-/*32*/	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
-/*33*/	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
-/*34*/	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
-/*35*/	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
-/*36*/	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
-/*37*/	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
-/*38*/	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
-/*39*/	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
-/*40*/	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
-		SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
-/*41*/	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
-/*42*/	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
-/*43*/	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
-/*44*/	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
-/*45*/	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
-/*46*/	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
-/*47*/	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
-/*48*/	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
-/*49*/	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
-/*50*/	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
-/*51*/	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
-/*52*/	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
-/*53*/	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
-/*54*/	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
-/*55*/	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
-/*56*/	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
-/*57*/	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
-/*58*/	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
-/*59*/	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
-/*60*/	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
-/*61*/	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
-/*62*/	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
-		SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
-/*63*/	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
-		SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
+[11] =	FLAG_ENTRY0("TxSbrdCtlStateMachineParityErr",
+		   SEES(TX_SBRD_CTL_STATE_MACHINE_PARITY)),
+[12] =	FLAG_ENTRY0("TxIllegalVLErr", SEES(TX_ILLEGAL_VL)),
+[13] =	FLAG_ENTRY0("TxLaunchCsrParityErr", SEES(TX_LAUNCH_CSR_PARITY)),
+[14] =	FLAG_ENTRY0("TxSbrdCtlCsrParityErr", SEES(TX_SBRD_CTL_CSR_PARITY)),
+[15] =	FLAG_ENTRY0("TxConfigParityErr", SEES(TX_CONFIG_PARITY)),
+[16] =	FLAG_ENTRY0("TxSdma0DisallowedPacketErr",
+		   SEES(TX_SDMA0_DISALLOWED_PACKET)),
+[17] =	FLAG_ENTRY0("TxSdma1DisallowedPacketErr",
+		   SEES(TX_SDMA1_DISALLOWED_PACKET)),
+[18] =	FLAG_ENTRY0("TxSdma2DisallowedPacketErr",
+		   SEES(TX_SDMA2_DISALLOWED_PACKET)),
+[19] =	FLAG_ENTRY0("TxSdma3DisallowedPacketErr",
+		   SEES(TX_SDMA3_DISALLOWED_PACKET)),
+[20] =	FLAG_ENTRY0("TxSdma4DisallowedPacketErr",
+		   SEES(TX_SDMA4_DISALLOWED_PACKET)),
+[21] =	FLAG_ENTRY0("TxSdma5DisallowedPacketErr",
+		   SEES(TX_SDMA5_DISALLOWED_PACKET)),
+[22] =	FLAG_ENTRY0("TxSdma6DisallowedPacketErr",
+		   SEES(TX_SDMA6_DISALLOWED_PACKET)),
+[23] =	FLAG_ENTRY0("TxSdma7DisallowedPacketErr",
+		   SEES(TX_SDMA7_DISALLOWED_PACKET)),
+[24] =	FLAG_ENTRY0("TxSdma8DisallowedPacketErr",
+		   SEES(TX_SDMA8_DISALLOWED_PACKET)),
+[25] =	FLAG_ENTRY0("TxSdma9DisallowedPacketErr",
+		   SEES(TX_SDMA9_DISALLOWED_PACKET)),
+[26] =	FLAG_ENTRY0("TxSdma10DisallowedPacketErr",
+		   SEES(TX_SDMA10_DISALLOWED_PACKET)),
+[27] =	FLAG_ENTRY0("TxSdma11DisallowedPacketErr",
+		   SEES(TX_SDMA11_DISALLOWED_PACKET)),
+[28] =	FLAG_ENTRY0("TxSdma12DisallowedPacketErr",
+		   SEES(TX_SDMA12_DISALLOWED_PACKET)),
+[29] =	FLAG_ENTRY0("TxSdma13DisallowedPacketErr",
+		   SEES(TX_SDMA13_DISALLOWED_PACKET)),
+[30] =	FLAG_ENTRY0("TxSdma14DisallowedPacketErr",
+		   SEES(TX_SDMA14_DISALLOWED_PACKET)),
+[31] =	FLAG_ENTRY0("TxSdma15DisallowedPacketErr",
+		   SEES(TX_SDMA15_DISALLOWED_PACKET)),
+[32] =	FLAG_ENTRY0("TxLaunchFifo0UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO0_UNC_OR_PARITY)),
+[33] =	FLAG_ENTRY0("TxLaunchFifo1UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO1_UNC_OR_PARITY)),
+[34] =	FLAG_ENTRY0("TxLaunchFifo2UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO2_UNC_OR_PARITY)),
+[35] =	FLAG_ENTRY0("TxLaunchFifo3UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO3_UNC_OR_PARITY)),
+[36] =	FLAG_ENTRY0("TxLaunchFifo4UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO4_UNC_OR_PARITY)),
+[37] =	FLAG_ENTRY0("TxLaunchFifo5UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO5_UNC_OR_PARITY)),
+[38] =	FLAG_ENTRY0("TxLaunchFifo6UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO6_UNC_OR_PARITY)),
+[39] =	FLAG_ENTRY0("TxLaunchFifo7UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO7_UNC_OR_PARITY)),
+[40] =	FLAG_ENTRY0("TxLaunchFifo8UncOrParityErr",
+		   SEES(TX_LAUNCH_FIFO8_UNC_OR_PARITY)),
+[41] =	FLAG_ENTRY0("TxCreditReturnParityErr", SEES(TX_CREDIT_RETURN_PARITY)),
+[42] =	FLAG_ENTRY0("TxSbHdrUncErr", SEES(TX_SB_HDR_UNC)),
+[43] =	FLAG_ENTRY0("TxReadSdmaMemoryUncErr", SEES(TX_READ_SDMA_MEMORY_UNC)),
+[44] =	FLAG_ENTRY0("TxReadPioMemoryUncErr", SEES(TX_READ_PIO_MEMORY_UNC)),
+[45] =	FLAG_ENTRY0("TxEgressFifoUncErr", SEES(TX_EGRESS_FIFO_UNC)),
+[46] =	FLAG_ENTRY0("TxHcrcInsertionErr", SEES(TX_HCRC_INSERTION)),
+[47] =	FLAG_ENTRY0("TxCreditReturnVLErr", SEES(TX_CREDIT_RETURN_VL)),
+[48] =	FLAG_ENTRY0("TxLaunchFifo0CorErr", SEES(TX_LAUNCH_FIFO0_COR)),
+[49] =	FLAG_ENTRY0("TxLaunchFifo1CorErr", SEES(TX_LAUNCH_FIFO1_COR)),
+[50] =	FLAG_ENTRY0("TxLaunchFifo2CorErr", SEES(TX_LAUNCH_FIFO2_COR)),
+[51] =	FLAG_ENTRY0("TxLaunchFifo3CorErr", SEES(TX_LAUNCH_FIFO3_COR)),
+[52] =	FLAG_ENTRY0("TxLaunchFifo4CorErr", SEES(TX_LAUNCH_FIFO4_COR)),
+[53] =	FLAG_ENTRY0("TxLaunchFifo5CorErr", SEES(TX_LAUNCH_FIFO5_COR)),
+[54] =	FLAG_ENTRY0("TxLaunchFifo6CorErr", SEES(TX_LAUNCH_FIFO6_COR)),
+[55] =	FLAG_ENTRY0("TxLaunchFifo7CorErr", SEES(TX_LAUNCH_FIFO7_COR)),
+[56] =	FLAG_ENTRY0("TxLaunchFifo8CorErr", SEES(TX_LAUNCH_FIFO8_COR)),
+[57] =	FLAG_ENTRY0("TxCreditOverrunErr", SEES(TX_CREDIT_OVERRUN)),
+[58] =	FLAG_ENTRY0("TxSbHdrCorErr", SEES(TX_SB_HDR_COR)),
+[59] =	FLAG_ENTRY0("TxReadSdmaMemoryCorErr", SEES(TX_READ_SDMA_MEMORY_COR)),
+[60] =	FLAG_ENTRY0("TxReadPioMemoryCorErr", SEES(TX_READ_PIO_MEMORY_COR)),
+[61] =	FLAG_ENTRY0("TxEgressFifoCorErr", SEES(TX_EGRESS_FIFO_COR)),
+[62] =	FLAG_ENTRY0("TxReadSdmaMemoryCsrUncErr",
+		   SEES(TX_READ_SDMA_MEMORY_CSR_UNC)),
+[63] =	FLAG_ENTRY0("TxReadPioMemoryCsrUncErr",
+		   SEES(TX_READ_PIO_MEMORY_CSR_UNC)),
 };
 
 /*
@@ -632,28 +632,28 @@ static struct flag_table egress_err_status_flags[] = {
  */
 #define SEEI(text) SEND_EGRESS_ERR_INFO_##text##_ERR_SMASK
 static struct flag_table egress_err_info_flags[] = {
-/* 0*/	FLAG_ENTRY0("Reserved", 0ull),
-/* 1*/	FLAG_ENTRY0("VLErr", SEEI(VL)),
-/* 2*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 3*/	FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
-/* 4*/	FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
-/* 5*/	FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
-/* 6*/	FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
-/* 7*/	FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
-/* 8*/	FLAG_ENTRY0("RawErr", SEEI(RAW)),
-/* 9*/	FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
-/*10*/	FLAG_ENTRY0("GRHErr", SEEI(GRH)),
-/*11*/	FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
-/*12*/	FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
-/*13*/	FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
-/*14*/	FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
-/*15*/	FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
-/*16*/	FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
-/*17*/	FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
-/*18*/	FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
-/*19*/	FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
-/*20*/	FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
-/*21*/	FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
+[0]  = FLAG_ENTRY0("Reserved", 0ull),
+[1]  = FLAG_ENTRY0("VLErr", SEEI(VL)),
+[2]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[3]  = FLAG_ENTRY0("JobKeyErr", SEEI(JOB_KEY)),
+[4]  = FLAG_ENTRY0("PartitionKeyErr", SEEI(PARTITION_KEY)),
+[5]  = FLAG_ENTRY0("SLIDErr", SEEI(SLID)),
+[6]  = FLAG_ENTRY0("OpcodeErr", SEEI(OPCODE)),
+[7]  = FLAG_ENTRY0("VLMappingErr", SEEI(VL_MAPPING)),
+[8]  = FLAG_ENTRY0("RawErr", SEEI(RAW)),
+[9]  = FLAG_ENTRY0("RawIPv6Err", SEEI(RAW_IPV6)),
+[10] = FLAG_ENTRY0("GRHErr", SEEI(GRH)),
+[11] = FLAG_ENTRY0("BypassErr", SEEI(BYPASS)),
+[12] = FLAG_ENTRY0("KDETHPacketsErr", SEEI(KDETH_PACKETS)),
+[13] = FLAG_ENTRY0("NonKDETHPacketsErr", SEEI(NON_KDETH_PACKETS)),
+[14] = FLAG_ENTRY0("TooSmallIBPacketsErr", SEEI(TOO_SMALL_IB_PACKETS)),
+[15] = FLAG_ENTRY0("TooSmallBypassPacketsErr", SEEI(TOO_SMALL_BYPASS_PACKETS)),
+[16] = FLAG_ENTRY0("PbcTestErr", SEEI(PBC_TEST)),
+[17] = FLAG_ENTRY0("BadPktLenErr", SEEI(BAD_PKT_LEN)),
+[18] = FLAG_ENTRY0("TooLongIBPacketErr", SEEI(TOO_LONG_IB_PACKET)),
+[19] = FLAG_ENTRY0("TooLongBypassPacketsErr", SEEI(TOO_LONG_BYPASS_PACKETS)),
+[20] = FLAG_ENTRY0("PbcStaticRateControlErr", SEEI(PBC_STATIC_RATE_CONTROL)),
+[21] = FLAG_ENTRY0("BypassBadPktLenErr", SEEI(BAD_PKT_LEN)),
 };
 
 /* TXE Egress errors that cause an SPC freeze */
@@ -681,28 +681,28 @@ static struct flag_table egress_err_info_flags[] = {
  */
 #define SES(name) SEND_ERR_STATUS_SEND_##name##_ERR_SMASK
 static struct flag_table send_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
-/* 1*/	FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
-/* 2*/	FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
+[0] = FLAG_ENTRY0("SendCsrParityErr", SES(CSR_PARITY)),
+[1] = FLAG_ENTRY0("SendCsrReadBadAddrErr", SES(CSR_READ_BAD_ADDR)),
+[2] = FLAG_ENTRY0("SendCsrWriteBadAddrErr", SES(CSR_WRITE_BAD_ADDR))
 };
 
 /*
  * TXE Send Context Error flags and consequences
  */
 static struct flag_table sc_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY("InconsistentSop",
+[0] =	FLAG_ENTRY("InconsistentSop",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_INCONSISTENT_SOP_ERR_SMASK),
-/* 1*/	FLAG_ENTRY("DisallowedPacket",
+[1] =	FLAG_ENTRY("DisallowedPacket",
 		SEC_PACKET_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_DISALLOWED_PACKET_ERR_SMASK),
-/* 2*/	FLAG_ENTRY("WriteCrossesBoundary",
+[2] =	FLAG_ENTRY("WriteCrossesBoundary",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_CROSSES_BOUNDARY_ERR_SMASK),
-/* 3*/	FLAG_ENTRY("WriteOverflow",
+[3] =	FLAG_ENTRY("WriteOverflow",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OVERFLOW_ERR_SMASK),
-/* 4*/	FLAG_ENTRY("WriteOutOfBounds",
+[4] =	FLAG_ENTRY("WriteOutOfBounds",
 		SEC_WRITE_DROPPED | SEC_SC_HALTED,
 		SEND_CTXT_ERR_STATUS_PIO_WRITE_OUT_OF_BOUNDS_ERR_SMASK),
 /* 5-63 reserved*/
@@ -713,82 +713,82 @@ static struct flag_table sc_err_status_flags[] = {
  */
 #define RXES(name) RCV_ERR_STATUS_RX_##name##_ERR_SMASK
 static struct flag_table rxe_err_status_flags[] = {
-/* 0*/	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
-/* 1*/	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
-/* 2*/	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
-/* 3*/	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
-/* 4*/	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
-/* 5*/	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
-/* 6*/	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
-/* 7*/	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
-/* 8*/	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
-/* 9*/	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
-/*10*/	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
-/*11*/	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
-/*12*/	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
-/*13*/	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
-/*14*/	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
-/*15*/	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
-/*16*/	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
-		RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
-/*17*/	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
-/*18*/	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
-/*19*/	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
-		RXES(RBUF_BLOCK_LIST_READ_UNC)),
-/*20*/	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
-		RXES(RBUF_BLOCK_LIST_READ_COR)),
-/*21*/	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
-		RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
-/*22*/	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
-		RXES(RBUF_CSR_QENT_CNT_PARITY)),
-/*23*/	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
-		RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
-/*24*/	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
-		RXES(RBUF_CSR_QVLD_BIT_PARITY)),
-/*25*/	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
-/*26*/	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
-/*27*/	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
-		RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
-/*28*/	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
-/*29*/	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
-/*30*/	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
-/*31*/	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
-/*32*/	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
-/*33*/	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
-/*34*/	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
-/*35*/	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
-		RXES(RBUF_FL_INITDONE_PARITY)),
-/*36*/	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
-		RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
-/*37*/	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
-/*38*/	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
-/*39*/	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
-/*40*/	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
-		RXES(LOOKUP_DES_PART1_UNC_COR)),
-/*41*/	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
-		RXES(LOOKUP_DES_PART2_PARITY)),
-/*42*/	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
-/*43*/	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
-/*44*/	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
-/*45*/	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
-/*46*/	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
-/*47*/	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
-/*48*/	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
-/*49*/	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
-/*50*/	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
-/*51*/	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
-/*52*/	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
-/*53*/	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
-/*54*/	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
-/*55*/	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
-/*56*/	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
-/*57*/	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
-/*58*/	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
-/*59*/	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
-/*60*/	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
-/*61*/	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
-/*62*/	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
-/*63*/	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
+[0]  =	FLAG_ENTRY0("RxDmaCsrCorErr", RXES(DMA_CSR_COR)),
+[1]  =	FLAG_ENTRY0("RxDcIntfParityErr", RXES(DC_INTF_PARITY)),
+[2]  =	FLAG_ENTRY0("RxRcvHdrUncErr", RXES(RCV_HDR_UNC)),
+[3]  =	FLAG_ENTRY0("RxRcvHdrCorErr", RXES(RCV_HDR_COR)),
+[4]  =	FLAG_ENTRY0("RxRcvDataUncErr", RXES(RCV_DATA_UNC)),
+[5]  =	FLAG_ENTRY0("RxRcvDataCorErr", RXES(RCV_DATA_COR)),
+[6]  =	FLAG_ENTRY0("RxRcvQpMapTableUncErr", RXES(RCV_QP_MAP_TABLE_UNC)),
+[7]  =	FLAG_ENTRY0("RxRcvQpMapTableCorErr", RXES(RCV_QP_MAP_TABLE_COR)),
+[8]  =	FLAG_ENTRY0("RxRcvCsrParityErr", RXES(RCV_CSR_PARITY)),
+[9]  =	FLAG_ENTRY0("RxDcSopEopParityErr", RXES(DC_SOP_EOP_PARITY)),
+[10] =	FLAG_ENTRY0("RxDmaFlagUncErr", RXES(DMA_FLAG_UNC)),
+[11] =	FLAG_ENTRY0("RxDmaFlagCorErr", RXES(DMA_FLAG_COR)),
+[12] =	FLAG_ENTRY0("RxRcvFsmEncodingErr", RXES(RCV_FSM_ENCODING)),
+[13] =	FLAG_ENTRY0("RxRbufFreeListUncErr", RXES(RBUF_FREE_LIST_UNC)),
+[14] =	FLAG_ENTRY0("RxRbufFreeListCorErr", RXES(RBUF_FREE_LIST_COR)),
+[15] =	FLAG_ENTRY0("RxRbufLookupDesRegUncErr", RXES(RBUF_LOOKUP_DES_REG_UNC)),
+[16] =	FLAG_ENTRY0("RxRbufLookupDesRegUncCorErr",
+		   RXES(RBUF_LOOKUP_DES_REG_UNC_COR)),
+[17] =	FLAG_ENTRY0("RxRbufLookupDesUncErr", RXES(RBUF_LOOKUP_DES_UNC)),
+[18] =	FLAG_ENTRY0("RxRbufLookupDesCorErr", RXES(RBUF_LOOKUP_DES_COR)),
+[19] =	FLAG_ENTRY0("RxRbufBlockListReadUncErr",
+		   RXES(RBUF_BLOCK_LIST_READ_UNC)),
+[20] =	FLAG_ENTRY0("RxRbufBlockListReadCorErr",
+		   RXES(RBUF_BLOCK_LIST_READ_COR)),
+[21] =	FLAG_ENTRY0("RxRbufCsrQHeadBufNumParityErr",
+		   RXES(RBUF_CSR_QHEAD_BUF_NUM_PARITY)),
+[22] =	FLAG_ENTRY0("RxRbufCsrQEntCntParityErr",
+		   RXES(RBUF_CSR_QENT_CNT_PARITY)),
+[23] =	FLAG_ENTRY0("RxRbufCsrQNextBufParityErr",
+		   RXES(RBUF_CSR_QNEXT_BUF_PARITY)),
+[24] =	FLAG_ENTRY0("RxRbufCsrQVldBitParityErr",
+		   RXES(RBUF_CSR_QVLD_BIT_PARITY)),
+[25] =	FLAG_ENTRY0("RxRbufCsrQHdPtrParityErr", RXES(RBUF_CSR_QHD_PTR_PARITY)),
+[26] =	FLAG_ENTRY0("RxRbufCsrQTlPtrParityErr", RXES(RBUF_CSR_QTL_PTR_PARITY)),
+[27] =	FLAG_ENTRY0("RxRbufCsrQNumOfPktParityErr",
+		   RXES(RBUF_CSR_QNUM_OF_PKT_PARITY)),
+[28] =	FLAG_ENTRY0("RxRbufCsrQEOPDWParityErr", RXES(RBUF_CSR_QEOPDW_PARITY)),
+[29] =	FLAG_ENTRY0("RxRbufCtxIdParityErr", RXES(RBUF_CTX_ID_PARITY)),
+[30] =	FLAG_ENTRY0("RxRBufBadLookupErr", RXES(RBUF_BAD_LOOKUP)),
+[31] =	FLAG_ENTRY0("RxRbufFullErr", RXES(RBUF_FULL)),
+[32] =	FLAG_ENTRY0("RxRbufEmptyErr", RXES(RBUF_EMPTY)),
+[33] =	FLAG_ENTRY0("RxRbufFlRdAddrParityErr", RXES(RBUF_FL_RD_ADDR_PARITY)),
+[34] =	FLAG_ENTRY0("RxRbufFlWrAddrParityErr", RXES(RBUF_FL_WR_ADDR_PARITY)),
+[35] =	FLAG_ENTRY0("RxRbufFlInitdoneParityErr",
+		   RXES(RBUF_FL_INITDONE_PARITY)),
+[36] =	FLAG_ENTRY0("RxRbufFlInitWrAddrParityErr",
+		   RXES(RBUF_FL_INIT_WR_ADDR_PARITY)),
+[37] =	FLAG_ENTRY0("RxRbufNextFreeBufUncErr", RXES(RBUF_NEXT_FREE_BUF_UNC)),
+[38] =	FLAG_ENTRY0("RxRbufNextFreeBufCorErr", RXES(RBUF_NEXT_FREE_BUF_COR)),
+[39] =	FLAG_ENTRY0("RxLookupDesPart1UncErr", RXES(LOOKUP_DES_PART1_UNC)),
+[40] =	FLAG_ENTRY0("RxLookupDesPart1UncCorErr",
+		   RXES(LOOKUP_DES_PART1_UNC_COR)),
+[41] =	FLAG_ENTRY0("RxLookupDesPart2ParityErr",
+		   RXES(LOOKUP_DES_PART2_PARITY)),
+[42] =	FLAG_ENTRY0("RxLookupRcvArrayUncErr", RXES(LOOKUP_RCV_ARRAY_UNC)),
+[43] =	FLAG_ENTRY0("RxLookupRcvArrayCorErr", RXES(LOOKUP_RCV_ARRAY_COR)),
+[44] =	FLAG_ENTRY0("RxLookupCsrParityErr", RXES(LOOKUP_CSR_PARITY)),
+[45] =	FLAG_ENTRY0("RxHqIntrCsrParityErr", RXES(HQ_INTR_CSR_PARITY)),
+[46] =	FLAG_ENTRY0("RxHqIntrFsmErr", RXES(HQ_INTR_FSM)),
+[47] =	FLAG_ENTRY0("RxRbufDescPart1UncErr", RXES(RBUF_DESC_PART1_UNC)),
+[48] =	FLAG_ENTRY0("RxRbufDescPart1CorErr", RXES(RBUF_DESC_PART1_COR)),
+[49] =	FLAG_ENTRY0("RxRbufDescPart2UncErr", RXES(RBUF_DESC_PART2_UNC)),
+[50] =	FLAG_ENTRY0("RxRbufDescPart2CorErr", RXES(RBUF_DESC_PART2_COR)),
+[51] =	FLAG_ENTRY0("RxDmaHdrFifoRdUncErr", RXES(DMA_HDR_FIFO_RD_UNC)),
+[52] =	FLAG_ENTRY0("RxDmaHdrFifoRdCorErr", RXES(DMA_HDR_FIFO_RD_COR)),
+[53] =	FLAG_ENTRY0("RxDmaDataFifoRdUncErr", RXES(DMA_DATA_FIFO_RD_UNC)),
+[54] =	FLAG_ENTRY0("RxDmaDataFifoRdCorErr", RXES(DMA_DATA_FIFO_RD_COR)),
+[55] =	FLAG_ENTRY0("RxRbufDataUncErr", RXES(RBUF_DATA_UNC)),
+[56] =	FLAG_ENTRY0("RxRbufDataCorErr", RXES(RBUF_DATA_COR)),
+[57] =	FLAG_ENTRY0("RxDmaCsrParityErr", RXES(DMA_CSR_PARITY)),
+[58] =	FLAG_ENTRY0("RxDmaEqFsmEncodingErr", RXES(DMA_EQ_FSM_ENCODING)),
+[59] =	FLAG_ENTRY0("RxDmaDqFsmEncodingErr", RXES(DMA_DQ_FSM_ENCODING)),
+[60] =	FLAG_ENTRY0("RxDmaCsrUncErr", RXES(DMA_CSR_UNC)),
+[61] =	FLAG_ENTRY0("RxCsrReadBadAddrErr", RXES(CSR_READ_BAD_ADDR)),
+[62] =	FLAG_ENTRY0("RxCsrWriteBadAddrErr", RXES(CSR_WRITE_BAD_ADDR)),
+[63] =	FLAG_ENTRY0("RxCsrParityErr", RXES(CSR_PARITY))
 };
 
 /* RXE errors that will trigger an SPC freeze */
@@ -901,42 +901,42 @@ static struct flag_table dcc_err_flags[] = {
  */
 #define LCBE(name) DC_LCB_ERR_FLG_##name##_SMASK
 static struct flag_table lcb_err_flags[] = {
-/* 0*/	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
-/* 1*/	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
-/* 2*/	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
-/* 3*/	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
-		LCBE(ALL_LNS_FAILED_REINIT_TEST)),
-/* 4*/	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
-/* 5*/	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
-/* 6*/	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
-/* 7*/	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
-/* 8*/	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
-/* 9*/	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
-/*10*/	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
-/*11*/	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
-/*12*/	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
-/*13*/	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
-		LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
-/*14*/	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
-/*15*/	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
-/*16*/	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
-/*17*/	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
-/*18*/	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
-/*19*/	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
-		LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
-/*20*/	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
-/*21*/	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
-/*22*/	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
-/*23*/	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
-/*24*/	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
-/*25*/	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
-/*26*/	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
-		LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
-/*27*/	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
-/*28*/	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
-		LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
-/*29*/	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
-		LCBE(REDUNDANT_FLIT_PARITY_ERR))
+[0]  =	FLAG_ENTRY0("CSR_PARITY_ERR", LCBE(CSR_PARITY_ERR)),
+[1]  =	FLAG_ENTRY0("INVALID_CSR_ADDR", LCBE(INVALID_CSR_ADDR)),
+[2]  =	FLAG_ENTRY0("RST_FOR_FAILED_DESKEW", LCBE(RST_FOR_FAILED_DESKEW)),
+[3]  =	FLAG_ENTRY0("ALL_LNS_FAILED_REINIT_TEST",
+		   LCBE(ALL_LNS_FAILED_REINIT_TEST)),
+[4]  =	FLAG_ENTRY0("LOST_REINIT_STALL_OR_TOS", LCBE(LOST_REINIT_STALL_OR_TOS)),
+[5]  =	FLAG_ENTRY0("TX_LESS_THAN_FOUR_LNS", LCBE(TX_LESS_THAN_FOUR_LNS)),
+[6]  =	FLAG_ENTRY0("RX_LESS_THAN_FOUR_LNS", LCBE(RX_LESS_THAN_FOUR_LNS)),
+[7]  =	FLAG_ENTRY0("SEQ_CRC_ERR", LCBE(SEQ_CRC_ERR)),
+[8]  =	FLAG_ENTRY0("REINIT_FROM_PEER", LCBE(REINIT_FROM_PEER)),
+[9]  =	FLAG_ENTRY0("REINIT_FOR_LN_DEGRADE", LCBE(REINIT_FOR_LN_DEGRADE)),
+[10] =	FLAG_ENTRY0("CRC_ERR_CNT_HIT_LIMIT", LCBE(CRC_ERR_CNT_HIT_LIMIT)),
+[11] =	FLAG_ENTRY0("RCLK_STOPPED", LCBE(RCLK_STOPPED)),
+[12] =	FLAG_ENTRY0("UNEXPECTED_REPLAY_MARKER", LCBE(UNEXPECTED_REPLAY_MARKER)),
+[13] =	FLAG_ENTRY0("UNEXPECTED_ROUND_TRIP_MARKER",
+		   LCBE(UNEXPECTED_ROUND_TRIP_MARKER)),
+[14] =	FLAG_ENTRY0("ILLEGAL_NULL_LTP", LCBE(ILLEGAL_NULL_LTP)),
+[15] =	FLAG_ENTRY0("ILLEGAL_FLIT_ENCODING", LCBE(ILLEGAL_FLIT_ENCODING)),
+[16] =	FLAG_ENTRY0("FLIT_INPUT_BUF_OFLW", LCBE(FLIT_INPUT_BUF_OFLW)),
+[17] =	FLAG_ENTRY0("VL_ACK_INPUT_BUF_OFLW", LCBE(VL_ACK_INPUT_BUF_OFLW)),
+[18] =	FLAG_ENTRY0("VL_ACK_INPUT_PARITY_ERR", LCBE(VL_ACK_INPUT_PARITY_ERR)),
+[19] =	FLAG_ENTRY0("VL_ACK_INPUT_WRONG_CRC_MODE",
+		   LCBE(VL_ACK_INPUT_WRONG_CRC_MODE)),
+[20] =	FLAG_ENTRY0("FLIT_INPUT_BUF_MBE", LCBE(FLIT_INPUT_BUF_MBE)),
+[21] =	FLAG_ENTRY0("FLIT_INPUT_BUF_SBE", LCBE(FLIT_INPUT_BUF_SBE)),
+[22] =	FLAG_ENTRY0("REPLAY_BUF_MBE", LCBE(REPLAY_BUF_MBE)),
+[23] =	FLAG_ENTRY0("REPLAY_BUF_SBE", LCBE(REPLAY_BUF_SBE)),
+[24] =	FLAG_ENTRY0("CREDIT_RETURN_FLIT_MBE", LCBE(CREDIT_RETURN_FLIT_MBE)),
+[25] =	FLAG_ENTRY0("RST_FOR_LINK_TIMEOUT", LCBE(RST_FOR_LINK_TIMEOUT)),
+[26] =	FLAG_ENTRY0("RST_FOR_INCOMPLT_RND_TRIP",
+		   LCBE(RST_FOR_INCOMPLT_RND_TRIP)),
+[27] =	FLAG_ENTRY0("HOLD_REINIT", LCBE(HOLD_REINIT)),
+[28] =	FLAG_ENTRY0("NEG_EDGE_LINK_TRANSFER_ACTIVE",
+		   LCBE(NEG_EDGE_LINK_TRANSFER_ACTIVE)),
+[29] =	FLAG_ENTRY0("REDUNDANT_FLIT_PARITY_ERR",
+		   LCBE(REDUNDANT_FLIT_PARITY_ERR))
 };
 
 /*
@@ -1098,14 +1098,14 @@ struct err_reg_info {
  * another register containing more information.
  */
 static const struct err_reg_info misc_errs[NUM_MISC_ERRS] = {
-/* 0*/	EE(CCE_ERR,		handle_cce_err,    "CceErr"),
-/* 1*/	EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
-/* 2*/	EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
-/* 3*/	{ 0, 0, 0, NULL }, /* reserved */
-/* 4*/	EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
-/* 5*/	EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
-/* 6*/	EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
-/* 7*/	EE(SEND_ERR,	handle_txe_err,    "TxeErr")
+	[0] = EE(CCE_ERR,		handle_cce_err,    "CceErr"),
+	[1] = EE(RCV_ERR,		handle_rxe_err,    "RxeErr"),
+	[2] = EE(MISC_ERR,	handle_misc_err,   "MiscErr"),
+	[3] = { 0, 0, 0, NULL }, /* reserved */
+	[4] = EE(SEND_PIO_ERR,    handle_pio_err,    "PioErr"),
+	[5] = EE(SEND_DMA_ERR,    handle_sdma_err,   "SDmaErr"),
+	[6] = EE(SEND_EGRESS_ERR, handle_egress_err, "EgressErr"),
+	[7] = EE(SEND_ERR,	handle_txe_err,    "TxeErr")
 	/* the rest are reserved */
 };
 
@@ -1123,11 +1123,11 @@ static const struct err_reg_info sdma_eng_err  	EE(SEND_DMA_ENG_ERR, handle_sdma_eng_err, "SDmaEngErr");
 
 static const struct err_reg_info various_err[NUM_VARIOUS] = {
-/* 0*/	{ 0, 0, 0, NULL }, /* PbcInt */
-/* 1*/	{ 0, 0, 0, NULL }, /* GpioAssertInt */
-/* 2*/	EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
-/* 3*/	EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
-/* 4*/	{ 0, 0, 0, NULL }, /* TCritInt */
+	[0] = { 0, 0, 0, NULL }, /* PbcInt */
+	[1] = { 0, 0, 0, NULL }, /* GpioAssertInt */
+	[2] = EE(ASIC_QSFP1,	handle_qsfp_int,	"QSFP1"),
+	[3] = EE(ASIC_QSFP2,	handle_qsfp_int,	"QSFP2"),
+	[4] = { 0, 0, 0, NULL }, /* TCritInt */
 	/* rest are reserved */
 };
 
@@ -5317,14 +5317,14 @@ static char *flag_string(char *buf, int buf_len, u64 flags,
 
 /* first 8 CCE error interrupt source names */
 static const char * const cce_misc_names[] = {
-	"CceErrInt",		/* 0 */
-	"RxeErrInt",		/* 1 */
-	"MiscErrInt",		/* 2 */
-	"Reserved3",		/* 3 */
-	"PioErrInt",		/* 4 */
-	"SDmaErrInt",		/* 5 */
-	"EgressErrInt",		/* 6 */
-	"TxeErrInt"		/* 7 */
+	[0] = "CceErrInt",
+	[1] = "RxeErrInt",
+	[2] = "MiscErrInt",
+	[3] = "Reserved3",
+	[4] = "PioErrInt",
+	[5] = "SDmaErrInt",
+	[6] = "EgressErrInt",
+	[7] = "TxeErrInt"
 };
 
 /*
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 4146a2113a95..a5cc1979b73a 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -1065,17 +1065,17 @@ static const struct {
 	u8 allowed[__N_PHYSTATES][__N_PHYSTATES];
 } physical_state_transitions = {
 	{
-		/* 2    3    4    5    6    7    8    9   10   11 */
-	/* 2 */	{ __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
-	/* 3 */	{ __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
-	/* 4 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 5 */	{ __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
-	/* 6 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 7 */	{ __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
-	/* 8 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/* 9 */	{ __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
-	/*10 */	{ __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
-	/*11 */	{ __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
+		     /* 2    3    4    5    6    7    8    9   10   11 */
+	[2]  = { __A, __A, __D, __D, __D, __D, __D, __D, __D, __D },
+	[3]  = { __A, __I, __D, __D, __D, __D, __D, __D, __D, __A },
+	[4]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[5]  = { __A, __A, __D, __I, __D, __D, __D, __D, __D, __D },
+	[6]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[7]  = { __D, __A, __D, __D, __D, __I, __D, __D, __D, __D },
+	[8]  = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[9]  = { __I, __A, __D, __D, __D, __D, __D, __I, __D, __D },
+	[10] = { __U, __U, __U, __U, __U, __U, __U, __U, __U, __U },
+	[11] = { __D, __A, __D, __D, __D, __D, __D, __D, __D, __I },
 	}
 };
 
@@ -1096,12 +1096,12 @@ static const struct {
 	u8 allowed[__N_LOGICAL_STATES][__N_LOGICAL_STATES];
 } logical_state_transitions = {
 	{
-		/* 1    2    3    4    5 */
-	/* 1 */	{ __I, __D, __D, __D, __U},
-	/* 2 */	{ __D, __I, __A, __D, __U},
-	/* 3 */	{ __D, __D, __I, __A, __U},
-	/* 4 */	{ __D, __D, __I, __I, __U},
-	/* 5 */	{ __U, __U, __U, __U, __U},
+		     /* 1    2    3    4    5 */
+	[1] = { __I, __D, __D, __D, __U},
+	[2] = { __D, __I, __A, __D, __U},
+	[3] = { __D, __D, __I, __A, __U},
+	[4] = { __D, __D, __I, __I, __U},
+	[5] = { __U, __U, __U, __U, __U},
 	}
 };
 
-- 
2.35.1

[PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
index 4e5d4a27633c..121b8a23ac07 100644
--- a/drivers/infiniband/sw/rdmavt/rc.c
+++ b/drivers/infiniband/sw/rdmavt/rc.c
@@ -10,37 +10,37 @@
  * Convert the AETH credit code into the number of credits.
  */
 static const u16 credit_table[31] = {
-	0,                      /* 0 */
-	1,                      /* 1 */
-	2,                      /* 2 */
-	3,                      /* 3 */
-	4,                      /* 4 */
-	6,                      /* 5 */
-	8,                      /* 6 */
-	12,                     /* 7 */
-	16,                     /* 8 */
-	24,                     /* 9 */
-	32,                     /* A */
-	48,                     /* B */
-	64,                     /* C */
-	96,                     /* D */
-	128,                    /* E */
-	192,                    /* F */
-	256,                    /* 10 */
-	384,                    /* 11 */
-	512,                    /* 12 */
-	768,                    /* 13 */
-	1024,                   /* 14 */
-	1536,                   /* 15 */
-	2048,                   /* 16 */
-	3072,                   /* 17 */
-	4096,                   /* 18 */
-	6144,                   /* 19 */
-	8192,                   /* 1A */
-	12288,                  /* 1B */
-	16384,                  /* 1C */
-	24576,                  /* 1D */
-	32768                   /* 1E */
+	[0x00] = 0,
+	[0x01] = 1,
+	[0x02] = 2,
+	[0x03] = 3,
+	[0x04] = 4,
+	[0x05] = 6,
+	[0x06] = 8,
+	[0x07] = 12,
+	[0x08] = 16,
+	[0x09] = 24,
+	[0x0A] = 32,
+	[0x0B] = 48,
+	[0x0C] = 64,
+	[0x0D] = 96,
+	[0x0E] = 128,
+	[0x0F] = 192,
+	[0x10] = 256,
+	[0x11] = 384,
+	[0x12] = 512,
+	[0x13] = 768,
+	[0x14] = 1024,
+	[0x15] = 1536,
+	[0x16] = 2048,
+	[0x17] = 3072,
+	[0x18] = 4096,
+	[0x19] = 6144,
+	[0x1A] = 8192,
+	[0x1B] = 12288,
+	[0x1C] = 16384,
+	[0x1D] = 24576,
+	[0x1E] = 32768
 };
 
 /**
-- 
2.35.1

[PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
index 4e5d4a27633c..121b8a23ac07 100644
--- a/drivers/infiniband/sw/rdmavt/rc.c
+++ b/drivers/infiniband/sw/rdmavt/rc.c
@@ -10,37 +10,37 @@
  * Convert the AETH credit code into the number of credits.
  */
 static const u16 credit_table[31] = {
-	0,                      /* 0 */
-	1,                      /* 1 */
-	2,                      /* 2 */
-	3,                      /* 3 */
-	4,                      /* 4 */
-	6,                      /* 5 */
-	8,                      /* 6 */
-	12,                     /* 7 */
-	16,                     /* 8 */
-	24,                     /* 9 */
-	32,                     /* A */
-	48,                     /* B */
-	64,                     /* C */
-	96,                     /* D */
-	128,                    /* E */
-	192,                    /* F */
-	256,                    /* 10 */
-	384,                    /* 11 */
-	512,                    /* 12 */
-	768,                    /* 13 */
-	1024,                   /* 14 */
-	1536,                   /* 15 */
-	2048,                   /* 16 */
-	3072,                   /* 17 */
-	4096,                   /* 18 */
-	6144,                   /* 19 */
-	8192,                   /* 1A */
-	12288,                  /* 1B */
-	16384,                  /* 1C */
-	24576,                  /* 1D */
-	32768                   /* 1E */
+	[0x00] = 0,
+	[0x01] = 1,
+	[0x02] = 2,
+	[0x03] = 3,
+	[0x04] = 4,
+	[0x05] = 6,
+	[0x06] = 8,
+	[0x07] = 12,
+	[0x08] = 16,
+	[0x09] = 24,
+	[0x0A] = 32,
+	[0x0B] = 48,
+	[0x0C] = 64,
+	[0x0D] = 96,
+	[0x0E] = 128,
+	[0x0F] = 192,
+	[0x10] = 256,
+	[0x11] = 384,
+	[0x12] = 512,
+	[0x13] = 768,
+	[0x14] = 1024,
+	[0x15] = 1536,
+	[0x16] = 2048,
+	[0x17] = 3072,
+	[0x18] = 4096,
+	[0x19] = 6144,
+	[0x1A] = 8192,
+	[0x1B] = 12288,
+	[0x1C] = 16384,
+	[0x1D] = 24576,
+	[0x1E] = 32768
 };
 
 /**
-- 
2.35.1

[PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
index 4e5d4a27633c..121b8a23ac07 100644
--- a/drivers/infiniband/sw/rdmavt/rc.c
+++ b/drivers/infiniband/sw/rdmavt/rc.c
@@ -10,37 +10,37 @@
  * Convert the AETH credit code into the number of credits.
  */
 static const u16 credit_table[31] = {
-	0,                      /* 0 */
-	1,                      /* 1 */
-	2,                      /* 2 */
-	3,                      /* 3 */
-	4,                      /* 4 */
-	6,                      /* 5 */
-	8,                      /* 6 */
-	12,                     /* 7 */
-	16,                     /* 8 */
-	24,                     /* 9 */
-	32,                     /* A */
-	48,                     /* B */
-	64,                     /* C */
-	96,                     /* D */
-	128,                    /* E */
-	192,                    /* F */
-	256,                    /* 10 */
-	384,                    /* 11 */
-	512,                    /* 12 */
-	768,                    /* 13 */
-	1024,                   /* 14 */
-	1536,                   /* 15 */
-	2048,                   /* 16 */
-	3072,                   /* 17 */
-	4096,                   /* 18 */
-	6144,                   /* 19 */
-	8192,                   /* 1A */
-	12288,                  /* 1B */
-	16384,                  /* 1C */
-	24576,                  /* 1D */
-	32768                   /* 1E */
+	[0x00] = 0,
+	[0x01] = 1,
+	[0x02] = 2,
+	[0x03] = 3,
+	[0x04] = 4,
+	[0x05] = 6,
+	[0x06] = 8,
+	[0x07] = 12,
+	[0x08] = 16,
+	[0x09] = 24,
+	[0x0A] = 32,
+	[0x0B] = 48,
+	[0x0C] = 64,
+	[0x0D] = 96,
+	[0x0E] = 128,
+	[0x0F] = 192,
+	[0x10] = 256,
+	[0x11] = 384,
+	[0x12] = 512,
+	[0x13] = 768,
+	[0x14] = 1024,
+	[0x15] = 1536,
+	[0x16] = 2048,
+	[0x17] = 3072,
+	[0x18] = 4096,
+	[0x19] = 6144,
+	[0x1A] = 8192,
+	[0x1B] = 12288,
+	[0x1C] = 16384,
+	[0x1D] = 24576,
+	[0x1E] = 32768
 };
 
 /**
-- 
2.35.1

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Leon Romanovsky]

On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
> index 4e5d4a27633c..121b8a23ac07 100644
> --- a/drivers/infiniband/sw/rdmavt/rc.c
> +++ b/drivers/infiniband/sw/rdmavt/rc.c
> @@ -10,37 +10,37 @@
>   * Convert the AETH credit code into the number of credits.
>   */
>  static const u16 credit_table[31] = {
> -	0,                      /* 0 */
> -	1,                      /* 1 */
> -	2,                      /* 2 */
> -	3,                      /* 3 */
> -	4,                      /* 4 */
> -	6,                      /* 5 */
> -	8,                      /* 6 */
> -	12,                     /* 7 */
> -	16,                     /* 8 */
> -	24,                     /* 9 */
> -	32,                     /* A */
> -	48,                     /* B */
> -	64,                     /* C */
> -	96,                     /* D */
> -	128,                    /* E */
> -	192,                    /* F */
> -	256,                    /* 10 */
> -	384,                    /* 11 */
> -	512,                    /* 12 */
> -	768,                    /* 13 */
> -	1024,                   /* 14 */
> -	1536,                   /* 15 */
> -	2048,                   /* 16 */
> -	3072,                   /* 17 */
> -	4096,                   /* 18 */
> -	6144,                   /* 19 */
> -	8192,                   /* 1A */
> -	12288,                  /* 1B */
> -	16384,                  /* 1C */
> -	24576,                  /* 1D */
> -	32768                   /* 1E */
> +	[0x00] = 0,
> +	[0x01] = 1,
> +	[0x02] = 2,
> +	[0x03] = 3,
> +	[0x04] = 4,
> +	[0x05] = 6,
> +	[0x06] = 8,
> +	[0x07] = 12,
> +	[0x08] = 16,
> +	[0x09] = 24,
> +	[0x0A] = 32,
> +	[0x0B] = 48,
> +	[0x0C] = 64,
> +	[0x0D] = 96,
> +	[0x0E] = 128,
> +	[0x0F] = 192,
> +	[0x10] = 256,
> +	[0x11] = 384,
> +	[0x12] = 512,
> +	[0x13] = 768,
> +	[0x14] = 1024,
> +	[0x15] = 1536,
> +	[0x16] = 2048,
> +	[0x17] = 3072,
> +	[0x18] = 4096,
> +	[0x19] = 6144,
> +	[0x1A] = 8192,
> +	[0x1B] = 12288,
> +	[0x1C] = 16384,
> +	[0x1D] = 24576,
> +	[0x1E] = 32768
>  };

I have hard time to see any value in this commit, why is this change needed?

Thanks

>  
>  /**
> -- 
> 2.35.1
> 
> 

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Leon Romanovsky]

On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
> index 4e5d4a27633c..121b8a23ac07 100644
> --- a/drivers/infiniband/sw/rdmavt/rc.c
> +++ b/drivers/infiniband/sw/rdmavt/rc.c
> @@ -10,37 +10,37 @@
>   * Convert the AETH credit code into the number of credits.
>   */
>  static const u16 credit_table[31] = {
> -	0,                      /* 0 */
> -	1,                      /* 1 */
> -	2,                      /* 2 */
> -	3,                      /* 3 */
> -	4,                      /* 4 */
> -	6,                      /* 5 */
> -	8,                      /* 6 */
> -	12,                     /* 7 */
> -	16,                     /* 8 */
> -	24,                     /* 9 */
> -	32,                     /* A */
> -	48,                     /* B */
> -	64,                     /* C */
> -	96,                     /* D */
> -	128,                    /* E */
> -	192,                    /* F */
> -	256,                    /* 10 */
> -	384,                    /* 11 */
> -	512,                    /* 12 */
> -	768,                    /* 13 */
> -	1024,                   /* 14 */
> -	1536,                   /* 15 */
> -	2048,                   /* 16 */
> -	3072,                   /* 17 */
> -	4096,                   /* 18 */
> -	6144,                   /* 19 */
> -	8192,                   /* 1A */
> -	12288,                  /* 1B */
> -	16384,                  /* 1C */
> -	24576,                  /* 1D */
> -	32768                   /* 1E */
> +	[0x00] = 0,
> +	[0x01] = 1,
> +	[0x02] = 2,
> +	[0x03] = 3,
> +	[0x04] = 4,
> +	[0x05] = 6,
> +	[0x06] = 8,
> +	[0x07] = 12,
> +	[0x08] = 16,
> +	[0x09] = 24,
> +	[0x0A] = 32,
> +	[0x0B] = 48,
> +	[0x0C] = 64,
> +	[0x0D] = 96,
> +	[0x0E] = 128,
> +	[0x0F] = 192,
> +	[0x10] = 256,
> +	[0x11] = 384,
> +	[0x12] = 512,
> +	[0x13] = 768,
> +	[0x14] = 1024,
> +	[0x15] = 1536,
> +	[0x16] = 2048,
> +	[0x17] = 3072,
> +	[0x18] = 4096,
> +	[0x19] = 6144,
> +	[0x1A] = 8192,
> +	[0x1B] = 12288,
> +	[0x1C] = 16384,
> +	[0x1D] = 24576,
> +	[0x1E] = 32768
>  };

I have hard time to see any value in this commit, why is this change needed?

Thanks

>  
>  /**
> -- 
> 2.35.1
> 
> 

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Leon Romanovsky]

On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
> index 4e5d4a27633c..121b8a23ac07 100644
> --- a/drivers/infiniband/sw/rdmavt/rc.c
> +++ b/drivers/infiniband/sw/rdmavt/rc.c
> @@ -10,37 +10,37 @@
>   * Convert the AETH credit code into the number of credits.
>   */
>  static const u16 credit_table[31] = {
> -	0,                      /* 0 */
> -	1,                      /* 1 */
> -	2,                      /* 2 */
> -	3,                      /* 3 */
> -	4,                      /* 4 */
> -	6,                      /* 5 */
> -	8,                      /* 6 */
> -	12,                     /* 7 */
> -	16,                     /* 8 */
> -	24,                     /* 9 */
> -	32,                     /* A */
> -	48,                     /* B */
> -	64,                     /* C */
> -	96,                     /* D */
> -	128,                    /* E */
> -	192,                    /* F */
> -	256,                    /* 10 */
> -	384,                    /* 11 */
> -	512,                    /* 12 */
> -	768,                    /* 13 */
> -	1024,                   /* 14 */
> -	1536,                   /* 15 */
> -	2048,                   /* 16 */
> -	3072,                   /* 17 */
> -	4096,                   /* 18 */
> -	6144,                   /* 19 */
> -	8192,                   /* 1A */
> -	12288,                  /* 1B */
> -	16384,                  /* 1C */
> -	24576,                  /* 1D */
> -	32768                   /* 1E */
> +	[0x00] = 0,
> +	[0x01] = 1,
> +	[0x02] = 2,
> +	[0x03] = 3,
> +	[0x04] = 4,
> +	[0x05] = 6,
> +	[0x06] = 8,
> +	[0x07] = 12,
> +	[0x08] = 16,
> +	[0x09] = 24,
> +	[0x0A] = 32,
> +	[0x0B] = 48,
> +	[0x0C] = 64,
> +	[0x0D] = 96,
> +	[0x0E] = 128,
> +	[0x0F] = 192,
> +	[0x10] = 256,
> +	[0x11] = 384,
> +	[0x12] = 512,
> +	[0x13] = 768,
> +	[0x14] = 1024,
> +	[0x15] = 1536,
> +	[0x16] = 2048,
> +	[0x17] = 3072,
> +	[0x18] = 4096,
> +	[0x19] = 6144,
> +	[0x1A] = 8192,
> +	[0x1B] = 12288,
> +	[0x1C] = 16384,
> +	[0x1D] = 24576,
> +	[0x1E] = 32768
>  };

I have hard time to see any value in this commit, why is this change needed?

Thanks

>  
>  /**
> -- 
> 2.35.1
> 
> 

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Dennis Dalessandro]

On 3/27/22 3:04 AM, Leon Romanovsky wrote:
> On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>>  1 file changed, 31 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
>> index 4e5d4a27633c..121b8a23ac07 100644
>> --- a/drivers/infiniband/sw/rdmavt/rc.c
>> +++ b/drivers/infiniband/sw/rdmavt/rc.c
>> @@ -10,37 +10,37 @@
>>   * Convert the AETH credit code into the number of credits.
>>   */
>>  static const u16 credit_table[31] = {
>> -	0,                      /* 0 */
>> -	1,                      /* 1 */
>> -	2,                      /* 2 */
>> -	3,                      /* 3 */
>> -	4,                      /* 4 */
>> -	6,                      /* 5 */
>> -	8,                      /* 6 */
>> -	12,                     /* 7 */
>> -	16,                     /* 8 */
>> -	24,                     /* 9 */
>> -	32,                     /* A */
>> -	48,                     /* B */
>> -	64,                     /* C */
>> -	96,                     /* D */
>> -	128,                    /* E */
>> -	192,                    /* F */
>> -	256,                    /* 10 */
>> -	384,                    /* 11 */
>> -	512,                    /* 12 */
>> -	768,                    /* 13 */
>> -	1024,                   /* 14 */
>> -	1536,                   /* 15 */
>> -	2048,                   /* 16 */
>> -	3072,                   /* 17 */
>> -	4096,                   /* 18 */
>> -	6144,                   /* 19 */
>> -	8192,                   /* 1A */
>> -	12288,                  /* 1B */
>> -	16384,                  /* 1C */
>> -	24576,                  /* 1D */
>> -	32768                   /* 1E */
>> +	[0x00] = 0,
>> +	[0x01] = 1,
>> +	[0x02] = 2,
>> +	[0x03] = 3,
>> +	[0x04] = 4,
>> +	[0x05] = 6,
>> +	[0x06] = 8,
>> +	[0x07] = 12,
>> +	[0x08] = 16,
>> +	[0x09] = 24,
>> +	[0x0A] = 32,
>> +	[0x0B] = 48,
>> +	[0x0C] = 64,
>> +	[0x0D] = 96,
>> +	[0x0E] = 128,
>> +	[0x0F] = 192,
>> +	[0x10] = 256,
>> +	[0x11] = 384,
>> +	[0x12] = 512,
>> +	[0x13] = 768,
>> +	[0x14] = 1024,
>> +	[0x15] = 1536,
>> +	[0x16] = 2048,
>> +	[0x17] = 3072,
>> +	[0x18] = 4096,
>> +	[0x19] = 6144,
>> +	[0x1A] = 8192,
>> +	[0x1B] = 12288,
>> +	[0x1C] = 16384,
>> +	[0x1D] = 24576,
>> +	[0x1E] = 32768
>>  };
> 
> I have hard time to see any value in this commit, why is this change needed?
> 

I tend to agree. This doesn't really improve things. It's a NAK from me.

-Denny

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Dennis Dalessandro]

On 3/27/22 3:04 AM, Leon Romanovsky wrote:
> On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>>  1 file changed, 31 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
>> index 4e5d4a27633c..121b8a23ac07 100644
>> --- a/drivers/infiniband/sw/rdmavt/rc.c
>> +++ b/drivers/infiniband/sw/rdmavt/rc.c
>> @@ -10,37 +10,37 @@
>>   * Convert the AETH credit code into the number of credits.
>>   */
>>  static const u16 credit_table[31] = {
>> -	0,                      /* 0 */
>> -	1,                      /* 1 */
>> -	2,                      /* 2 */
>> -	3,                      /* 3 */
>> -	4,                      /* 4 */
>> -	6,                      /* 5 */
>> -	8,                      /* 6 */
>> -	12,                     /* 7 */
>> -	16,                     /* 8 */
>> -	24,                     /* 9 */
>> -	32,                     /* A */
>> -	48,                     /* B */
>> -	64,                     /* C */
>> -	96,                     /* D */
>> -	128,                    /* E */
>> -	192,                    /* F */
>> -	256,                    /* 10 */
>> -	384,                    /* 11 */
>> -	512,                    /* 12 */
>> -	768,                    /* 13 */
>> -	1024,                   /* 14 */
>> -	1536,                   /* 15 */
>> -	2048,                   /* 16 */
>> -	3072,                   /* 17 */
>> -	4096,                   /* 18 */
>> -	6144,                   /* 19 */
>> -	8192,                   /* 1A */
>> -	12288,                  /* 1B */
>> -	16384,                  /* 1C */
>> -	24576,                  /* 1D */
>> -	32768                   /* 1E */
>> +	[0x00] = 0,
>> +	[0x01] = 1,
>> +	[0x02] = 2,
>> +	[0x03] = 3,
>> +	[0x04] = 4,
>> +	[0x05] = 6,
>> +	[0x06] = 8,
>> +	[0x07] = 12,
>> +	[0x08] = 16,
>> +	[0x09] = 24,
>> +	[0x0A] = 32,
>> +	[0x0B] = 48,
>> +	[0x0C] = 64,
>> +	[0x0D] = 96,
>> +	[0x0E] = 128,
>> +	[0x0F] = 192,
>> +	[0x10] = 256,
>> +	[0x11] = 384,
>> +	[0x12] = 512,
>> +	[0x13] = 768,
>> +	[0x14] = 1024,
>> +	[0x15] = 1536,
>> +	[0x16] = 2048,
>> +	[0x17] = 3072,
>> +	[0x18] = 4096,
>> +	[0x19] = 6144,
>> +	[0x1A] = 8192,
>> +	[0x1B] = 12288,
>> +	[0x1C] = 16384,
>> +	[0x1D] = 24576,
>> +	[0x1E] = 32768
>>  };
> 
> I have hard time to see any value in this commit, why is this change needed?
> 

I tend to agree. This doesn't really improve things. It's a NAK from me.

-Denny

Re: [PATCH 11/22] rdmavt: Replace comments with C99 initializers

[Dennis Dalessandro]

On 3/27/22 3:04 AM, Leon Romanovsky wrote:
> On Sat, Mar 26, 2022 at 05:58:58PM +0100, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>  drivers/infiniband/sw/rdmavt/rc.c | 62 +++++++++++++++----------------
>>  1 file changed, 31 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/infiniband/sw/rdmavt/rc.c b/drivers/infiniband/sw/rdmavt/rc.c
>> index 4e5d4a27633c..121b8a23ac07 100644
>> --- a/drivers/infiniband/sw/rdmavt/rc.c
>> +++ b/drivers/infiniband/sw/rdmavt/rc.c
>> @@ -10,37 +10,37 @@
>>   * Convert the AETH credit code into the number of credits.
>>   */
>>  static const u16 credit_table[31] = {
>> -	0,                      /* 0 */
>> -	1,                      /* 1 */
>> -	2,                      /* 2 */
>> -	3,                      /* 3 */
>> -	4,                      /* 4 */
>> -	6,                      /* 5 */
>> -	8,                      /* 6 */
>> -	12,                     /* 7 */
>> -	16,                     /* 8 */
>> -	24,                     /* 9 */
>> -	32,                     /* A */
>> -	48,                     /* B */
>> -	64,                     /* C */
>> -	96,                     /* D */
>> -	128,                    /* E */
>> -	192,                    /* F */
>> -	256,                    /* 10 */
>> -	384,                    /* 11 */
>> -	512,                    /* 12 */
>> -	768,                    /* 13 */
>> -	1024,                   /* 14 */
>> -	1536,                   /* 15 */
>> -	2048,                   /* 16 */
>> -	3072,                   /* 17 */
>> -	4096,                   /* 18 */
>> -	6144,                   /* 19 */
>> -	8192,                   /* 1A */
>> -	12288,                  /* 1B */
>> -	16384,                  /* 1C */
>> -	24576,                  /* 1D */
>> -	32768                   /* 1E */
>> +	[0x00] = 0,
>> +	[0x01] = 1,
>> +	[0x02] = 2,
>> +	[0x03] = 3,
>> +	[0x04] = 4,
>> +	[0x05] = 6,
>> +	[0x06] = 8,
>> +	[0x07] = 12,
>> +	[0x08] = 16,
>> +	[0x09] = 24,
>> +	[0x0A] = 32,
>> +	[0x0B] = 48,
>> +	[0x0C] = 64,
>> +	[0x0D] = 96,
>> +	[0x0E] = 128,
>> +	[0x0F] = 192,
>> +	[0x10] = 256,
>> +	[0x11] = 384,
>> +	[0x12] = 512,
>> +	[0x13] = 768,
>> +	[0x14] = 1024,
>> +	[0x15] = 1536,
>> +	[0x16] = 2048,
>> +	[0x17] = 3072,
>> +	[0x18] = 4096,
>> +	[0x19] = 6144,
>> +	[0x1A] = 8192,
>> +	[0x1B] = 12288,
>> +	[0x1C] = 16384,
>> +	[0x1D] = 24576,
>> +	[0x1E] = 32768
>>  };
> 
> I have hard time to see any value in this commit, why is this change needed?
> 

I tend to agree. This doesn't really improve things. It's a NAK from me.

-Denny

[PATCH 12/22] alps: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/input/mouse/alps.c | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4a6b33bbe7ea..333f18b198eb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -33,60 +33,60 @@
 #define ALPS_REG_BASE_PINNACLE	0x0000
 
 static const struct alps_nibble_commands alps_v3_nibble_commands[] = {
-	{ PSMOUSE_CMD_SETPOLL,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_SETPOLL,		0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v4_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 1 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 7 */
-	{ PSMOUSE_CMD_GETID,		0x00 }, /* 8 */
-	{ PSMOUSE_CMD_GETINFO,		0x00 }, /* 9 */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* d */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x2] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0x8] = { PSMOUSE_CMD_GETID,		   0x00 },
+	[0x9] = { PSMOUSE_CMD_GETINFO,		0x00 },
+	[0xa] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xe] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 
-- 
2.35.1

[PATCH 12/22] alps: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/input/mouse/alps.c | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4a6b33bbe7ea..333f18b198eb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -33,60 +33,60 @@
 #define ALPS_REG_BASE_PINNACLE	0x0000
 
 static const struct alps_nibble_commands alps_v3_nibble_commands[] = {
-	{ PSMOUSE_CMD_SETPOLL,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_SETPOLL,		0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v4_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 1 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 7 */
-	{ PSMOUSE_CMD_GETID,		0x00 }, /* 8 */
-	{ PSMOUSE_CMD_GETINFO,		0x00 }, /* 9 */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* d */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x2] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0x8] = { PSMOUSE_CMD_GETID,		   0x00 },
+	[0x9] = { PSMOUSE_CMD_GETINFO,		0x00 },
+	[0xa] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xe] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 
-- 
2.35.1

[PATCH 12/22] alps: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/input/mouse/alps.c | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4a6b33bbe7ea..333f18b198eb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -33,60 +33,60 @@
 #define ALPS_REG_BASE_PINNACLE	0x0000
 
 static const struct alps_nibble_commands alps_v3_nibble_commands[] = {
-	{ PSMOUSE_CMD_SETPOLL,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_SETPOLL,		0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v4_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */
-	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_RESET_DIS,	   0x00 },
+	[0x2] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x8] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x9] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0xa] = { ALPS_CMD_NIBBLE_10,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xe] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
-	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */
-	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 1 */
-	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 2 */
-	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 3 */
-	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 4 */
-	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 5 */
-	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 6 */
-	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 7 */
-	{ PSMOUSE_CMD_GETID,		0x00 }, /* 8 */
-	{ PSMOUSE_CMD_GETINFO,		0x00 }, /* 9 */
-	{ PSMOUSE_CMD_SETRES,		0x00 }, /* a */
-	{ PSMOUSE_CMD_SETRES,		0x01 }, /* b */
-	{ PSMOUSE_CMD_SETRES,		0x02 }, /* c */
-	{ PSMOUSE_CMD_SETRES,		0x03 }, /* d */
-	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* e */
-	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */
+	[0x0] = { PSMOUSE_CMD_ENABLE,		   0x00 },
+	[0x1] = { PSMOUSE_CMD_SETRATE,		0x0a },
+	[0x2] = { PSMOUSE_CMD_SETRATE,		0x14 },
+	[0x3] = { PSMOUSE_CMD_SETRATE,		0x28 },
+	[0x4] = { PSMOUSE_CMD_SETRATE,		0x3c },
+	[0x5] = { PSMOUSE_CMD_SETRATE,		0x50 },
+	[0x6] = { PSMOUSE_CMD_SETRATE,		0x64 },
+	[0x7] = { PSMOUSE_CMD_SETRATE,		0xc8 },
+	[0x8] = { PSMOUSE_CMD_GETID,		   0x00 },
+	[0x9] = { PSMOUSE_CMD_GETINFO,		0x00 },
+	[0xa] = { PSMOUSE_CMD_SETRES,		   0x00 },
+	[0xb] = { PSMOUSE_CMD_SETRES,		   0x01 },
+	[0xc] = { PSMOUSE_CMD_SETRES,		   0x02 },
+	[0xd] = { PSMOUSE_CMD_SETRES,		   0x03 },
+	[0xe] = { PSMOUSE_CMD_SETSCALE21,	0x00 },
+	[0xf] = { PSMOUSE_CMD_SETSCALE11,	0x00 },
 };
 
 
-- 
2.35.1

[PATCH 13/22] capi: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/capi/capiutil.c | 240 ++++++++++++++---------------------
 1 file changed, 96 insertions(+), 144 deletions(-)

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index d7ae42edc4a8..1213f5cb976e 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -38,102 +38,54 @@ typedef struct {
 
 static _cdef cdef[] =
 {
-	/*00 */
-	{_CEND},
-	/*01 */
-	{_CEND},
-	/*02 */
-	{_CEND},
-	/*03 */
-	{_CDWORD, offsetof(_cmsg, adr.adrController)},
-	/*04 */
-	{_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
-	/*05 */
-	{_CSTRUCT, offsetof(_cmsg, B1configuration)},
-	/*06 */
-	{_CWORD, offsetof(_cmsg, B1protocol)},
-	/*07 */
-	{_CSTRUCT, offsetof(_cmsg, B2configuration)},
-	/*08 */
-	{_CWORD, offsetof(_cmsg, B2protocol)},
-	/*09 */
-	{_CSTRUCT, offsetof(_cmsg, B3configuration)},
-	/*0a */
-	{_CWORD, offsetof(_cmsg, B3protocol)},
-	/*0b */
-	{_CSTRUCT, offsetof(_cmsg, BC)},
-	/*0c */
-	{_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
-	/*0d */
-	{_CMSTRUCT, offsetof(_cmsg, BProtocol)},
-	/*0e */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
-	/*0f */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
-	/*10 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
-	/*11 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
-	/*12 */
-	{_CDWORD, offsetof(_cmsg, CIPmask)},
-	/*13 */
-	{_CDWORD, offsetof(_cmsg, CIPmask2)},
-	/*14 */
-	{_CWORD, offsetof(_cmsg, CIPValue)},
-	/*15 */
-	{_CDWORD, offsetof(_cmsg, Class)},
-	/*16 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
-	/*17 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
-	/*18 */
-	{_CDWORD, offsetof(_cmsg, Data)},
-	/*19 */
-	{_CWORD, offsetof(_cmsg, DataHandle)},
-	/*1a */
-	{_CWORD, offsetof(_cmsg, DataLength)},
-	/*1b */
-	{_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
-	/*1c */
-	{_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
-	/*1d */
-	{_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
-	/*1e */
-	{_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
-	/*1f */
-	{_CWORD, offsetof(_cmsg, FacilitySelector)},
-	/*20 */
-	{_CWORD, offsetof(_cmsg, Flags)},
-	/*21 */
-	{_CDWORD, offsetof(_cmsg, Function)},
-	/*22 */
-	{_CSTRUCT, offsetof(_cmsg, HLC)},
-	/*23 */
-	{_CWORD, offsetof(_cmsg, Info)},
-	/*24 */
-	{_CSTRUCT, offsetof(_cmsg, InfoElement)},
-	/*25 */
-	{_CDWORD, offsetof(_cmsg, InfoMask)},
-	/*26 */
-	{_CWORD, offsetof(_cmsg, InfoNumber)},
-	/*27 */
-	{_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
-	/*28 */
-	{_CSTRUCT, offsetof(_cmsg, LLC)},
-	/*29 */
-	{_CSTRUCT, offsetof(_cmsg, ManuData)},
-	/*2a */
-	{_CDWORD, offsetof(_cmsg, ManuID)},
-	/*2b */
-	{_CSTRUCT, offsetof(_cmsg, NCPI)},
-	/*2c */
-	{_CWORD, offsetof(_cmsg, Reason)},
-	/*2d */
-	{_CWORD, offsetof(_cmsg, Reason_B3)},
-	/*2e */
-	{_CWORD, offsetof(_cmsg, Reject)},
-	/*2f */
-	{_CSTRUCT, offsetof(_cmsg, Useruserdata)}
+	[0x00] = {_CEND},
+	[0x01] = {_CEND},
+	[0x02] = {_CEND},
+	[0x03] = {_CDWORD, offsetof(_cmsg, adr.adrController)},
+	[0x04] = {_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
+	[0x05] = {_CSTRUCT, offsetof(_cmsg, B1configuration)},
+	[0x06] = {_CWORD, offsetof(_cmsg, B1protocol)},
+	[0x07] = {_CSTRUCT, offsetof(_cmsg, B2configuration)},
+	[0x08] = {_CWORD, offsetof(_cmsg, B2protocol)},
+	[0x09] = {_CSTRUCT, offsetof(_cmsg, B3configuration)},
+	[0x0a] = {_CWORD, offsetof(_cmsg, B3protocol)},
+	[0x0b] = {_CSTRUCT, offsetof(_cmsg, BC)},
+	[0x0c] = {_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
+	[0x0d] = {_CMSTRUCT, offsetof(_cmsg, BProtocol)},
+	[0x0e] = {_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
+	[0x0f] = {_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
+	[0x10] = {_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
+	[0x11] = {_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
+	[0x12] = {_CDWORD, offsetof(_cmsg, CIPmask)},
+	[0x13] = {_CDWORD, offsetof(_cmsg, CIPmask2)},
+	[0x14] = {_CWORD, offsetof(_cmsg, CIPValue)},
+	[0x15] = {_CDWORD, offsetof(_cmsg, Class)},
+	[0x16] = {_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
+	[0x17] = {_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
+	[0x18] = {_CDWORD, offsetof(_cmsg, Data)},
+	[0x19] = {_CWORD, offsetof(_cmsg, DataHandle)},
+	[0x1a] = {_CWORD, offsetof(_cmsg, DataLength)},
+	[0x1b] = {_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
+	[0x1c] = {_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
+	[0x1d] = {_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
+	[0x1e] = {_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
+	[0x1f] = {_CWORD, offsetof(_cmsg, FacilitySelector)},
+	[0x20] = {_CWORD, offsetof(_cmsg, Flags)},
+	[0x21] = {_CDWORD, offsetof(_cmsg, Function)},
+	[0x22] = {_CSTRUCT, offsetof(_cmsg, HLC)},
+	[0x23] = {_CWORD, offsetof(_cmsg, Info)},
+	[0x24] = {_CSTRUCT, offsetof(_cmsg, InfoElement)},
+	[0x25] = {_CDWORD, offsetof(_cmsg, InfoMask)},
+	[0x26] = {_CWORD, offsetof(_cmsg, InfoNumber)},
+	[0x27] = {_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
+	[0x28] = {_CSTRUCT, offsetof(_cmsg, LLC)},
+	[0x29] = {_CSTRUCT, offsetof(_cmsg, ManuData)},
+	[0x2a] = {_CDWORD, offsetof(_cmsg, ManuID)},
+	[0x2b] = {_CSTRUCT, offsetof(_cmsg, NCPI)},
+	[0x2c] = {_CWORD, offsetof(_cmsg, Reason)},
+	[0x2d] = {_CWORD, offsetof(_cmsg, Reason_B3)},
+	[0x2e] = {_CWORD, offsetof(_cmsg, Reject)},
+	[0x2f] = {_CSTRUCT, offsetof(_cmsg, Useruserdata)}
 };
 
 static unsigned char *cpars[] =
@@ -329,54 +281,54 @@ char *capi_cmd2str(u8 cmd, u8 subcmd)
 
 static char *pnames[] =
 {
-	/*00 */ NULL,
-	/*01 */ NULL,
-	/*02 */ NULL,
-	/*03 */ "Controller/PLCI/NCCI",
-	/*04 */ "AdditionalInfo",
-	/*05 */ "B1configuration",
-	/*06 */ "B1protocol",
-	/*07 */ "B2configuration",
-	/*08 */ "B2protocol",
-	/*09 */ "B3configuration",
-	/*0a */ "B3protocol",
-	/*0b */ "BC",
-	/*0c */ "BChannelinformation",
-	/*0d */ "BProtocol",
-	/*0e */ "CalledPartyNumber",
-	/*0f */ "CalledPartySubaddress",
-	/*10 */ "CallingPartyNumber",
-	/*11 */ "CallingPartySubaddress",
-	/*12 */ "CIPmask",
-	/*13 */ "CIPmask2",
-	/*14 */ "CIPValue",
-	/*15 */ "Class",
-	/*16 */ "ConnectedNumber",
-	/*17 */ "ConnectedSubaddress",
-	/*18 */ "Data32",
-	/*19 */ "DataHandle",
-	/*1a */ "DataLength",
-	/*1b */ "FacilityConfirmationParameter",
-	/*1c */ "Facilitydataarray",
-	/*1d */ "FacilityIndicationParameter",
-	/*1e */ "FacilityRequestParameter",
-	/*1f */ "FacilitySelector",
-	/*20 */ "Flags",
-	/*21 */ "Function",
-	/*22 */ "HLC",
-	/*23 */ "Info",
-	/*24 */ "InfoElement",
-	/*25 */ "InfoMask",
-	/*26 */ "InfoNumber",
-	/*27 */ "Keypadfacility",
-	/*28 */ "LLC",
-	/*29 */ "ManuData",
-	/*2a */ "ManuID",
-	/*2b */ "NCPI",
-	/*2c */ "Reason",
-	/*2d */ "Reason_B3",
-	/*2e */ "Reject",
-	/*2f */ "Useruserdata"
+	[0x00] = NULL,
+	[0x01] = NULL,
+	[0x02] = NULL,
+	[0x03] = "Controller/PLCI/NCCI",
+	[0x04] = "AdditionalInfo",
+	[0x05] = "B1configuration",
+	[0x06] = "B1protocol",
+	[0x07] = "B2configuration",
+	[0x08] = "B2protocol",
+	[0x09] = "B3configuration",
+	[0x0a] = "B3protocol",
+	[0x0b] = "BC",
+	[0x0c] = "BChannelinformation",
+	[0x0d] = "BProtocol",
+	[0x0e] = "CalledPartyNumber",
+	[0x0f] = "CalledPartySubaddress",
+	[0x10] = "CallingPartyNumber",
+	[0x11] = "CallingPartySubaddress",
+	[0x12] = "CIPmask",
+	[0x13] = "CIPmask2",
+	[0x14] = "CIPValue",
+	[0x15] = "Class",
+	[0x16] = "ConnectedNumber",
+	[0x17] = "ConnectedSubaddress",
+	[0x18] = "Data32",
+	[0x19] = "DataHandle",
+	[0x1a] = "DataLength",
+	[0x1b] = "FacilityConfirmationParameter",
+	[0x1c] = "Facilitydataarray",
+	[0x1d] = "FacilityIndicationParameter",
+	[0x1e] = "FacilityRequestParameter",
+	[0x1f] = "FacilitySelector",
+	[0x20] = "Flags",
+	[0x21] = "Function",
+	[0x22] = "HLC",
+	[0x23] = "Info",
+	[0x24] = "InfoElement",
+	[0x25] = "InfoMask",
+	[0x26] = "InfoNumber",
+	[0x27] = "Keypadfacility",
+	[0x28] = "LLC",
+	[0x29] = "ManuData",
+	[0x2a] = "ManuID",
+	[0x2b] = "NCPI",
+	[0x2c] = "Reason",
+	[0x2d] = "Reason_B3",
+	[0x2e] = "Reject",
+	[0x2f] = "Useruserdata"
 };
 
 #include <linux/stdarg.h>
-- 
2.35.1

[PATCH 13/22] capi: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/capi/capiutil.c | 240 ++++++++++++++---------------------
 1 file changed, 96 insertions(+), 144 deletions(-)

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index d7ae42edc4a8..1213f5cb976e 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -38,102 +38,54 @@ typedef struct {
 
 static _cdef cdef[] =
 {
-	/*00 */
-	{_CEND},
-	/*01 */
-	{_CEND},
-	/*02 */
-	{_CEND},
-	/*03 */
-	{_CDWORD, offsetof(_cmsg, adr.adrController)},
-	/*04 */
-	{_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
-	/*05 */
-	{_CSTRUCT, offsetof(_cmsg, B1configuration)},
-	/*06 */
-	{_CWORD, offsetof(_cmsg, B1protocol)},
-	/*07 */
-	{_CSTRUCT, offsetof(_cmsg, B2configuration)},
-	/*08 */
-	{_CWORD, offsetof(_cmsg, B2protocol)},
-	/*09 */
-	{_CSTRUCT, offsetof(_cmsg, B3configuration)},
-	/*0a */
-	{_CWORD, offsetof(_cmsg, B3protocol)},
-	/*0b */
-	{_CSTRUCT, offsetof(_cmsg, BC)},
-	/*0c */
-	{_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
-	/*0d */
-	{_CMSTRUCT, offsetof(_cmsg, BProtocol)},
-	/*0e */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
-	/*0f */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
-	/*10 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
-	/*11 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
-	/*12 */
-	{_CDWORD, offsetof(_cmsg, CIPmask)},
-	/*13 */
-	{_CDWORD, offsetof(_cmsg, CIPmask2)},
-	/*14 */
-	{_CWORD, offsetof(_cmsg, CIPValue)},
-	/*15 */
-	{_CDWORD, offsetof(_cmsg, Class)},
-	/*16 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
-	/*17 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
-	/*18 */
-	{_CDWORD, offsetof(_cmsg, Data)},
-	/*19 */
-	{_CWORD, offsetof(_cmsg, DataHandle)},
-	/*1a */
-	{_CWORD, offsetof(_cmsg, DataLength)},
-	/*1b */
-	{_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
-	/*1c */
-	{_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
-	/*1d */
-	{_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
-	/*1e */
-	{_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
-	/*1f */
-	{_CWORD, offsetof(_cmsg, FacilitySelector)},
-	/*20 */
-	{_CWORD, offsetof(_cmsg, Flags)},
-	/*21 */
-	{_CDWORD, offsetof(_cmsg, Function)},
-	/*22 */
-	{_CSTRUCT, offsetof(_cmsg, HLC)},
-	/*23 */
-	{_CWORD, offsetof(_cmsg, Info)},
-	/*24 */
-	{_CSTRUCT, offsetof(_cmsg, InfoElement)},
-	/*25 */
-	{_CDWORD, offsetof(_cmsg, InfoMask)},
-	/*26 */
-	{_CWORD, offsetof(_cmsg, InfoNumber)},
-	/*27 */
-	{_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
-	/*28 */
-	{_CSTRUCT, offsetof(_cmsg, LLC)},
-	/*29 */
-	{_CSTRUCT, offsetof(_cmsg, ManuData)},
-	/*2a */
-	{_CDWORD, offsetof(_cmsg, ManuID)},
-	/*2b */
-	{_CSTRUCT, offsetof(_cmsg, NCPI)},
-	/*2c */
-	{_CWORD, offsetof(_cmsg, Reason)},
-	/*2d */
-	{_CWORD, offsetof(_cmsg, Reason_B3)},
-	/*2e */
-	{_CWORD, offsetof(_cmsg, Reject)},
-	/*2f */
-	{_CSTRUCT, offsetof(_cmsg, Useruserdata)}
+	[0x00] = {_CEND},
+	[0x01] = {_CEND},
+	[0x02] = {_CEND},
+	[0x03] = {_CDWORD, offsetof(_cmsg, adr.adrController)},
+	[0x04] = {_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
+	[0x05] = {_CSTRUCT, offsetof(_cmsg, B1configuration)},
+	[0x06] = {_CWORD, offsetof(_cmsg, B1protocol)},
+	[0x07] = {_CSTRUCT, offsetof(_cmsg, B2configuration)},
+	[0x08] = {_CWORD, offsetof(_cmsg, B2protocol)},
+	[0x09] = {_CSTRUCT, offsetof(_cmsg, B3configuration)},
+	[0x0a] = {_CWORD, offsetof(_cmsg, B3protocol)},
+	[0x0b] = {_CSTRUCT, offsetof(_cmsg, BC)},
+	[0x0c] = {_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
+	[0x0d] = {_CMSTRUCT, offsetof(_cmsg, BProtocol)},
+	[0x0e] = {_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
+	[0x0f] = {_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
+	[0x10] = {_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
+	[0x11] = {_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
+	[0x12] = {_CDWORD, offsetof(_cmsg, CIPmask)},
+	[0x13] = {_CDWORD, offsetof(_cmsg, CIPmask2)},
+	[0x14] = {_CWORD, offsetof(_cmsg, CIPValue)},
+	[0x15] = {_CDWORD, offsetof(_cmsg, Class)},
+	[0x16] = {_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
+	[0x17] = {_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
+	[0x18] = {_CDWORD, offsetof(_cmsg, Data)},
+	[0x19] = {_CWORD, offsetof(_cmsg, DataHandle)},
+	[0x1a] = {_CWORD, offsetof(_cmsg, DataLength)},
+	[0x1b] = {_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
+	[0x1c] = {_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
+	[0x1d] = {_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
+	[0x1e] = {_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
+	[0x1f] = {_CWORD, offsetof(_cmsg, FacilitySelector)},
+	[0x20] = {_CWORD, offsetof(_cmsg, Flags)},
+	[0x21] = {_CDWORD, offsetof(_cmsg, Function)},
+	[0x22] = {_CSTRUCT, offsetof(_cmsg, HLC)},
+	[0x23] = {_CWORD, offsetof(_cmsg, Info)},
+	[0x24] = {_CSTRUCT, offsetof(_cmsg, InfoElement)},
+	[0x25] = {_CDWORD, offsetof(_cmsg, InfoMask)},
+	[0x26] = {_CWORD, offsetof(_cmsg, InfoNumber)},
+	[0x27] = {_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
+	[0x28] = {_CSTRUCT, offsetof(_cmsg, LLC)},
+	[0x29] = {_CSTRUCT, offsetof(_cmsg, ManuData)},
+	[0x2a] = {_CDWORD, offsetof(_cmsg, ManuID)},
+	[0x2b] = {_CSTRUCT, offsetof(_cmsg, NCPI)},
+	[0x2c] = {_CWORD, offsetof(_cmsg, Reason)},
+	[0x2d] = {_CWORD, offsetof(_cmsg, Reason_B3)},
+	[0x2e] = {_CWORD, offsetof(_cmsg, Reject)},
+	[0x2f] = {_CSTRUCT, offsetof(_cmsg, Useruserdata)}
 };
 
 static unsigned char *cpars[] =
@@ -329,54 +281,54 @@ char *capi_cmd2str(u8 cmd, u8 subcmd)
 
 static char *pnames[] =
 {
-	/*00 */ NULL,
-	/*01 */ NULL,
-	/*02 */ NULL,
-	/*03 */ "Controller/PLCI/NCCI",
-	/*04 */ "AdditionalInfo",
-	/*05 */ "B1configuration",
-	/*06 */ "B1protocol",
-	/*07 */ "B2configuration",
-	/*08 */ "B2protocol",
-	/*09 */ "B3configuration",
-	/*0a */ "B3protocol",
-	/*0b */ "BC",
-	/*0c */ "BChannelinformation",
-	/*0d */ "BProtocol",
-	/*0e */ "CalledPartyNumber",
-	/*0f */ "CalledPartySubaddress",
-	/*10 */ "CallingPartyNumber",
-	/*11 */ "CallingPartySubaddress",
-	/*12 */ "CIPmask",
-	/*13 */ "CIPmask2",
-	/*14 */ "CIPValue",
-	/*15 */ "Class",
-	/*16 */ "ConnectedNumber",
-	/*17 */ "ConnectedSubaddress",
-	/*18 */ "Data32",
-	/*19 */ "DataHandle",
-	/*1a */ "DataLength",
-	/*1b */ "FacilityConfirmationParameter",
-	/*1c */ "Facilitydataarray",
-	/*1d */ "FacilityIndicationParameter",
-	/*1e */ "FacilityRequestParameter",
-	/*1f */ "FacilitySelector",
-	/*20 */ "Flags",
-	/*21 */ "Function",
-	/*22 */ "HLC",
-	/*23 */ "Info",
-	/*24 */ "InfoElement",
-	/*25 */ "InfoMask",
-	/*26 */ "InfoNumber",
-	/*27 */ "Keypadfacility",
-	/*28 */ "LLC",
-	/*29 */ "ManuData",
-	/*2a */ "ManuID",
-	/*2b */ "NCPI",
-	/*2c */ "Reason",
-	/*2d */ "Reason_B3",
-	/*2e */ "Reject",
-	/*2f */ "Useruserdata"
+	[0x00] = NULL,
+	[0x01] = NULL,
+	[0x02] = NULL,
+	[0x03] = "Controller/PLCI/NCCI",
+	[0x04] = "AdditionalInfo",
+	[0x05] = "B1configuration",
+	[0x06] = "B1protocol",
+	[0x07] = "B2configuration",
+	[0x08] = "B2protocol",
+	[0x09] = "B3configuration",
+	[0x0a] = "B3protocol",
+	[0x0b] = "BC",
+	[0x0c] = "BChannelinformation",
+	[0x0d] = "BProtocol",
+	[0x0e] = "CalledPartyNumber",
+	[0x0f] = "CalledPartySubaddress",
+	[0x10] = "CallingPartyNumber",
+	[0x11] = "CallingPartySubaddress",
+	[0x12] = "CIPmask",
+	[0x13] = "CIPmask2",
+	[0x14] = "CIPValue",
+	[0x15] = "Class",
+	[0x16] = "ConnectedNumber",
+	[0x17] = "ConnectedSubaddress",
+	[0x18] = "Data32",
+	[0x19] = "DataHandle",
+	[0x1a] = "DataLength",
+	[0x1b] = "FacilityConfirmationParameter",
+	[0x1c] = "Facilitydataarray",
+	[0x1d] = "FacilityIndicationParameter",
+	[0x1e] = "FacilityRequestParameter",
+	[0x1f] = "FacilitySelector",
+	[0x20] = "Flags",
+	[0x21] = "Function",
+	[0x22] = "HLC",
+	[0x23] = "Info",
+	[0x24] = "InfoElement",
+	[0x25] = "InfoMask",
+	[0x26] = "InfoNumber",
+	[0x27] = "Keypadfacility",
+	[0x28] = "LLC",
+	[0x29] = "ManuData",
+	[0x2a] = "ManuID",
+	[0x2b] = "NCPI",
+	[0x2c] = "Reason",
+	[0x2d] = "Reason_B3",
+	[0x2e] = "Reject",
+	[0x2f] = "Useruserdata"
 };
 
 #include <linux/stdarg.h>
-- 
2.35.1

[PATCH 13/22] capi: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/capi/capiutil.c | 240 ++++++++++++++---------------------
 1 file changed, 96 insertions(+), 144 deletions(-)

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index d7ae42edc4a8..1213f5cb976e 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -38,102 +38,54 @@ typedef struct {
 
 static _cdef cdef[]  {
-	/*00 */
-	{_CEND},
-	/*01 */
-	{_CEND},
-	/*02 */
-	{_CEND},
-	/*03 */
-	{_CDWORD, offsetof(_cmsg, adr.adrController)},
-	/*04 */
-	{_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
-	/*05 */
-	{_CSTRUCT, offsetof(_cmsg, B1configuration)},
-	/*06 */
-	{_CWORD, offsetof(_cmsg, B1protocol)},
-	/*07 */
-	{_CSTRUCT, offsetof(_cmsg, B2configuration)},
-	/*08 */
-	{_CWORD, offsetof(_cmsg, B2protocol)},
-	/*09 */
-	{_CSTRUCT, offsetof(_cmsg, B3configuration)},
-	/*0a */
-	{_CWORD, offsetof(_cmsg, B3protocol)},
-	/*0b */
-	{_CSTRUCT, offsetof(_cmsg, BC)},
-	/*0c */
-	{_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
-	/*0d */
-	{_CMSTRUCT, offsetof(_cmsg, BProtocol)},
-	/*0e */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
-	/*0f */
-	{_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
-	/*10 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
-	/*11 */
-	{_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
-	/*12 */
-	{_CDWORD, offsetof(_cmsg, CIPmask)},
-	/*13 */
-	{_CDWORD, offsetof(_cmsg, CIPmask2)},
-	/*14 */
-	{_CWORD, offsetof(_cmsg, CIPValue)},
-	/*15 */
-	{_CDWORD, offsetof(_cmsg, Class)},
-	/*16 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
-	/*17 */
-	{_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
-	/*18 */
-	{_CDWORD, offsetof(_cmsg, Data)},
-	/*19 */
-	{_CWORD, offsetof(_cmsg, DataHandle)},
-	/*1a */
-	{_CWORD, offsetof(_cmsg, DataLength)},
-	/*1b */
-	{_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
-	/*1c */
-	{_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
-	/*1d */
-	{_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
-	/*1e */
-	{_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
-	/*1f */
-	{_CWORD, offsetof(_cmsg, FacilitySelector)},
-	/*20 */
-	{_CWORD, offsetof(_cmsg, Flags)},
-	/*21 */
-	{_CDWORD, offsetof(_cmsg, Function)},
-	/*22 */
-	{_CSTRUCT, offsetof(_cmsg, HLC)},
-	/*23 */
-	{_CWORD, offsetof(_cmsg, Info)},
-	/*24 */
-	{_CSTRUCT, offsetof(_cmsg, InfoElement)},
-	/*25 */
-	{_CDWORD, offsetof(_cmsg, InfoMask)},
-	/*26 */
-	{_CWORD, offsetof(_cmsg, InfoNumber)},
-	/*27 */
-	{_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
-	/*28 */
-	{_CSTRUCT, offsetof(_cmsg, LLC)},
-	/*29 */
-	{_CSTRUCT, offsetof(_cmsg, ManuData)},
-	/*2a */
-	{_CDWORD, offsetof(_cmsg, ManuID)},
-	/*2b */
-	{_CSTRUCT, offsetof(_cmsg, NCPI)},
-	/*2c */
-	{_CWORD, offsetof(_cmsg, Reason)},
-	/*2d */
-	{_CWORD, offsetof(_cmsg, Reason_B3)},
-	/*2e */
-	{_CWORD, offsetof(_cmsg, Reject)},
-	/*2f */
-	{_CSTRUCT, offsetof(_cmsg, Useruserdata)}
+	[0x00] = {_CEND},
+	[0x01] = {_CEND},
+	[0x02] = {_CEND},
+	[0x03] = {_CDWORD, offsetof(_cmsg, adr.adrController)},
+	[0x04] = {_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)},
+	[0x05] = {_CSTRUCT, offsetof(_cmsg, B1configuration)},
+	[0x06] = {_CWORD, offsetof(_cmsg, B1protocol)},
+	[0x07] = {_CSTRUCT, offsetof(_cmsg, B2configuration)},
+	[0x08] = {_CWORD, offsetof(_cmsg, B2protocol)},
+	[0x09] = {_CSTRUCT, offsetof(_cmsg, B3configuration)},
+	[0x0a] = {_CWORD, offsetof(_cmsg, B3protocol)},
+	[0x0b] = {_CSTRUCT, offsetof(_cmsg, BC)},
+	[0x0c] = {_CSTRUCT, offsetof(_cmsg, BChannelinformation)},
+	[0x0d] = {_CMSTRUCT, offsetof(_cmsg, BProtocol)},
+	[0x0e] = {_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)},
+	[0x0f] = {_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)},
+	[0x10] = {_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)},
+	[0x11] = {_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)},
+	[0x12] = {_CDWORD, offsetof(_cmsg, CIPmask)},
+	[0x13] = {_CDWORD, offsetof(_cmsg, CIPmask2)},
+	[0x14] = {_CWORD, offsetof(_cmsg, CIPValue)},
+	[0x15] = {_CDWORD, offsetof(_cmsg, Class)},
+	[0x16] = {_CSTRUCT, offsetof(_cmsg, ConnectedNumber)},
+	[0x17] = {_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)},
+	[0x18] = {_CDWORD, offsetof(_cmsg, Data)},
+	[0x19] = {_CWORD, offsetof(_cmsg, DataHandle)},
+	[0x1a] = {_CWORD, offsetof(_cmsg, DataLength)},
+	[0x1b] = {_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)},
+	[0x1c] = {_CSTRUCT, offsetof(_cmsg, Facilitydataarray)},
+	[0x1d] = {_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)},
+	[0x1e] = {_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)},
+	[0x1f] = {_CWORD, offsetof(_cmsg, FacilitySelector)},
+	[0x20] = {_CWORD, offsetof(_cmsg, Flags)},
+	[0x21] = {_CDWORD, offsetof(_cmsg, Function)},
+	[0x22] = {_CSTRUCT, offsetof(_cmsg, HLC)},
+	[0x23] = {_CWORD, offsetof(_cmsg, Info)},
+	[0x24] = {_CSTRUCT, offsetof(_cmsg, InfoElement)},
+	[0x25] = {_CDWORD, offsetof(_cmsg, InfoMask)},
+	[0x26] = {_CWORD, offsetof(_cmsg, InfoNumber)},
+	[0x27] = {_CSTRUCT, offsetof(_cmsg, Keypadfacility)},
+	[0x28] = {_CSTRUCT, offsetof(_cmsg, LLC)},
+	[0x29] = {_CSTRUCT, offsetof(_cmsg, ManuData)},
+	[0x2a] = {_CDWORD, offsetof(_cmsg, ManuID)},
+	[0x2b] = {_CSTRUCT, offsetof(_cmsg, NCPI)},
+	[0x2c] = {_CWORD, offsetof(_cmsg, Reason)},
+	[0x2d] = {_CWORD, offsetof(_cmsg, Reason_B3)},
+	[0x2e] = {_CWORD, offsetof(_cmsg, Reject)},
+	[0x2f] = {_CSTRUCT, offsetof(_cmsg, Useruserdata)}
 };
 
 static unsigned char *cpars[] @@ -329,54 +281,54 @@ char *capi_cmd2str(u8 cmd, u8 subcmd)
 
 static char *pnames[]  {
-	/*00 */ NULL,
-	/*01 */ NULL,
-	/*02 */ NULL,
-	/*03 */ "Controller/PLCI/NCCI",
-	/*04 */ "AdditionalInfo",
-	/*05 */ "B1configuration",
-	/*06 */ "B1protocol",
-	/*07 */ "B2configuration",
-	/*08 */ "B2protocol",
-	/*09 */ "B3configuration",
-	/*0a */ "B3protocol",
-	/*0b */ "BC",
-	/*0c */ "BChannelinformation",
-	/*0d */ "BProtocol",
-	/*0e */ "CalledPartyNumber",
-	/*0f */ "CalledPartySubaddress",
-	/*10 */ "CallingPartyNumber",
-	/*11 */ "CallingPartySubaddress",
-	/*12 */ "CIPmask",
-	/*13 */ "CIPmask2",
-	/*14 */ "CIPValue",
-	/*15 */ "Class",
-	/*16 */ "ConnectedNumber",
-	/*17 */ "ConnectedSubaddress",
-	/*18 */ "Data32",
-	/*19 */ "DataHandle",
-	/*1a */ "DataLength",
-	/*1b */ "FacilityConfirmationParameter",
-	/*1c */ "Facilitydataarray",
-	/*1d */ "FacilityIndicationParameter",
-	/*1e */ "FacilityRequestParameter",
-	/*1f */ "FacilitySelector",
-	/*20 */ "Flags",
-	/*21 */ "Function",
-	/*22 */ "HLC",
-	/*23 */ "Info",
-	/*24 */ "InfoElement",
-	/*25 */ "InfoMask",
-	/*26 */ "InfoNumber",
-	/*27 */ "Keypadfacility",
-	/*28 */ "LLC",
-	/*29 */ "ManuData",
-	/*2a */ "ManuID",
-	/*2b */ "NCPI",
-	/*2c */ "Reason",
-	/*2d */ "Reason_B3",
-	/*2e */ "Reject",
-	/*2f */ "Useruserdata"
+	[0x00] = NULL,
+	[0x01] = NULL,
+	[0x02] = NULL,
+	[0x03] = "Controller/PLCI/NCCI",
+	[0x04] = "AdditionalInfo",
+	[0x05] = "B1configuration",
+	[0x06] = "B1protocol",
+	[0x07] = "B2configuration",
+	[0x08] = "B2protocol",
+	[0x09] = "B3configuration",
+	[0x0a] = "B3protocol",
+	[0x0b] = "BC",
+	[0x0c] = "BChannelinformation",
+	[0x0d] = "BProtocol",
+	[0x0e] = "CalledPartyNumber",
+	[0x0f] = "CalledPartySubaddress",
+	[0x10] = "CallingPartyNumber",
+	[0x11] = "CallingPartySubaddress",
+	[0x12] = "CIPmask",
+	[0x13] = "CIPmask2",
+	[0x14] = "CIPValue",
+	[0x15] = "Class",
+	[0x16] = "ConnectedNumber",
+	[0x17] = "ConnectedSubaddress",
+	[0x18] = "Data32",
+	[0x19] = "DataHandle",
+	[0x1a] = "DataLength",
+	[0x1b] = "FacilityConfirmationParameter",
+	[0x1c] = "Facilitydataarray",
+	[0x1d] = "FacilityIndicationParameter",
+	[0x1e] = "FacilityRequestParameter",
+	[0x1f] = "FacilitySelector",
+	[0x20] = "Flags",
+	[0x21] = "Function",
+	[0x22] = "HLC",
+	[0x23] = "Info",
+	[0x24] = "InfoElement",
+	[0x25] = "InfoMask",
+	[0x26] = "InfoNumber",
+	[0x27] = "Keypadfacility",
+	[0x28] = "LLC",
+	[0x29] = "ManuData",
+	[0x2a] = "ManuID",
+	[0x2b] = "NCPI",
+	[0x2c] = "Reason",
+	[0x2d] = "Reason_B3",
+	[0x2e] = "Reject",
+	[0x2f] = "Useruserdata"
 };
 
 #include <linux/stdarg.h>
-- 
2.35.1

[PATCH 14/22] mISDN: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/hardware/mISDN/hfcmulti.c | 88 +++++++++++++-------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4f7eaa17fb27..fb6ed4167845 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5283,50 +5283,50 @@ static void hfc_remove_pci(struct pci_dev *pdev)
 #define VENDOR_PRIM	"PrimuX"
 
 static const struct hm_map hfcm_map[] = {
-	/*0*/	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
-	/*1*/	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*2*/	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*3*/	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*4*/	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*5*/	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
-	/*6*/	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*7*/	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*8*/	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
-	/*9*/	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*10*/	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*11*/	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
-
-	/*12*/	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*13*/	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
-		 HFC_IO_MODE_REGIO, 0},
-	/*14*/	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
-	/*15*/	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*16*/	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*17*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*18*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*19*/	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*20*/	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*21*/	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*22*/	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-
-	/*23*/	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
-	/*24*/	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*25*/	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
-
-	/*26*/	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*27*/	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*28*/	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
-	/*29*/	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
-	/*30*/	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*31*/	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_EMBSD, XHFC_IRQ},
-	/*32*/	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*33*/	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*34*/	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[0]  =	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
+	[1]  =	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[2]  =	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[3]  =	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[4]  =	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[5]  =	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
+	[6]  =	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[7]  =	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
+	[8]  =	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
+	[9]  =	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
+	[10] =	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[11] =	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
+
+	[12] =	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
+	[13] =	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
+		       HFC_IO_MODE_REGIO, 0},
+	[14] =	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
+	[15] =	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[16] =	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
+	[17] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+	[18] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[19] =	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[20] =	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
+	[21] =	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[22] =	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+
+	[23] =	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
+	[24] =	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
+	[25] =	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
+
+	[26] =	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[27] =	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[28] =	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
+	[29] =	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
+	[30] =	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
+	[31] =	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_EMBSD, XHFC_IRQ},
+	[32] =	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
+	[33] =	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[34] =	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
 };
 
 #undef H
-- 
2.35.1

[PATCH 14/22] mISDN: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/hardware/mISDN/hfcmulti.c | 88 +++++++++++++-------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4f7eaa17fb27..fb6ed4167845 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5283,50 +5283,50 @@ static void hfc_remove_pci(struct pci_dev *pdev)
 #define VENDOR_PRIM	"PrimuX"
 
 static const struct hm_map hfcm_map[] = {
-	/*0*/	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
-	/*1*/	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*2*/	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*3*/	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*4*/	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*5*/	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
-	/*6*/	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*7*/	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*8*/	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
-	/*9*/	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*10*/	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*11*/	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
-
-	/*12*/	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*13*/	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
-		 HFC_IO_MODE_REGIO, 0},
-	/*14*/	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
-	/*15*/	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*16*/	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*17*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*18*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*19*/	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*20*/	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*21*/	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*22*/	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-
-	/*23*/	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
-	/*24*/	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*25*/	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
-
-	/*26*/	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*27*/	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*28*/	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
-	/*29*/	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
-	/*30*/	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*31*/	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_EMBSD, XHFC_IRQ},
-	/*32*/	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*33*/	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*34*/	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[0]  =	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
+	[1]  =	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[2]  =	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[3]  =	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[4]  =	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[5]  =	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
+	[6]  =	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[7]  =	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
+	[8]  =	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
+	[9]  =	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
+	[10] =	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[11] =	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
+
+	[12] =	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
+	[13] =	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
+		       HFC_IO_MODE_REGIO, 0},
+	[14] =	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
+	[15] =	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[16] =	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
+	[17] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+	[18] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[19] =	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[20] =	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
+	[21] =	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[22] =	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+
+	[23] =	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
+	[24] =	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
+	[25] =	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
+
+	[26] =	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[27] =	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[28] =	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
+	[29] =	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
+	[30] =	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
+	[31] =	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_EMBSD, XHFC_IRQ},
+	[32] =	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
+	[33] =	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[34] =	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
 };
 
 #undef H
-- 
2.35.1

[PATCH 14/22] mISDN: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/isdn/hardware/mISDN/hfcmulti.c | 88 +++++++++++++-------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4f7eaa17fb27..fb6ed4167845 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5283,50 +5283,50 @@ static void hfc_remove_pci(struct pci_dev *pdev)
 #define VENDOR_PRIM	"PrimuX"
 
 static const struct hm_map hfcm_map[] = {
-	/*0*/	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
-	/*1*/	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*2*/	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*3*/	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*4*/	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*5*/	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
-	/*6*/	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
-	/*7*/	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*8*/	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
-	/*9*/	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*10*/	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
-	/*11*/	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
-
-	/*12*/	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*13*/	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
-		 HFC_IO_MODE_REGIO, 0},
-	/*14*/	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
-	/*15*/	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*16*/	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*17*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*18*/	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
-
-	/*19*/	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*20*/	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*21*/	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-	/*22*/	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
-
-	/*23*/	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
-	/*24*/	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
-	/*25*/	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
-
-	/*26*/	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*27*/	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
-		 HFC_IO_MODE_PLXSD, 0},
-	/*28*/	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
-	/*29*/	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
-	/*30*/	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*31*/	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
-		 HFC_IO_MODE_EMBSD, XHFC_IRQ},
-	/*32*/	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
-	/*33*/	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
-	/*34*/	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[0]  =	{VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
+	[1]  =	{VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[2]  =	{VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[3]  =	{VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[4]  =	{VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[5]  =	{VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
+	[6]  =	{VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
+	[7]  =	{VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
+	[8]  =	{VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
+	[9]  =	{VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
+	[10] =	{VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
+	[11] =	{VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
+
+	[12] =	{VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
+	[13] =	{VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
+		       HFC_IO_MODE_REGIO, 0},
+	[14] =	{VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
+	[15] =	{VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[16] =	{VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
+	[17] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+	[18] =	{VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
+
+	[19] =	{VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[20] =	{VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
+	[21] =	{VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+	[22] =	{VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
+
+	[23] =	{VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
+	[24] =	{VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
+	[25] =	{VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
+
+	[26] =	{VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[27] =	{VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
+		       HFC_IO_MODE_PLXSD, 0},
+	[28] =	{VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
+	[29] =	{VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
+	[30] =	{VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
+	[31] =	{VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
+		       HFC_IO_MODE_EMBSD, XHFC_IRQ},
+	[32] =	{VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
+	[33] =	{VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+	[34] =	{VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
 };
 
 #undef H
-- 
2.35.1

[PATCH 15/22] macintosh: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/macintosh/adbhid.c | 256 ++++++++++++++++++-------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 994ba5cb3678..6e44623cf084 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -77,134 +77,134 @@ static struct notifier_block adbhid_adb_notifier = {
 #define ADB_KEY_POWER		0x7f
 
 static const u16 adb_to_linux_keycodes[128] = {
-	/* 0x00 */ KEY_A, 		/*  30 */
-	/* 0x01 */ KEY_S, 		/*  31 */
-	/* 0x02 */ KEY_D,		/*  32 */
-	/* 0x03 */ KEY_F,		/*  33 */
-	/* 0x04 */ KEY_H,		/*  35 */
-	/* 0x05 */ KEY_G,		/*  34 */
-	/* 0x06 */ KEY_Z,		/*  44 */
-	/* 0x07 */ KEY_X,		/*  45 */
-	/* 0x08 */ KEY_C,		/*  46 */
-	/* 0x09 */ KEY_V,		/*  47 */
-	/* 0x0a */ KEY_102ND,		/*  86 */
-	/* 0x0b */ KEY_B,		/*  48 */
-	/* 0x0c */ KEY_Q,		/*  16 */
-	/* 0x0d */ KEY_W,		/*  17 */
-	/* 0x0e */ KEY_E,		/*  18 */
-	/* 0x0f */ KEY_R,		/*  19 */
-	/* 0x10 */ KEY_Y,		/*  21 */
-	/* 0x11 */ KEY_T,		/*  20 */
-	/* 0x12 */ KEY_1,		/*   2 */
-	/* 0x13 */ KEY_2,		/*   3 */
-	/* 0x14 */ KEY_3,		/*   4 */
-	/* 0x15 */ KEY_4,		/*   5 */
-	/* 0x16 */ KEY_6,		/*   7 */
-	/* 0x17 */ KEY_5,		/*   6 */
-	/* 0x18 */ KEY_EQUAL,		/*  13 */
-	/* 0x19 */ KEY_9,		/*  10 */
-	/* 0x1a */ KEY_7,		/*   8 */
-	/* 0x1b */ KEY_MINUS,		/*  12 */
-	/* 0x1c */ KEY_8,		/*   9 */
-	/* 0x1d */ KEY_0,		/*  11 */
-	/* 0x1e */ KEY_RIGHTBRACE,	/*  27 */
-	/* 0x1f */ KEY_O,		/*  24 */
-	/* 0x20 */ KEY_U,		/*  22 */
-	/* 0x21 */ KEY_LEFTBRACE,	/*  26 */
-	/* 0x22 */ KEY_I,		/*  23 */
-	/* 0x23 */ KEY_P,		/*  25 */
-	/* 0x24 */ KEY_ENTER,		/*  28 */
-	/* 0x25 */ KEY_L,		/*  38 */
-	/* 0x26 */ KEY_J,		/*  36 */
-	/* 0x27 */ KEY_APOSTROPHE,	/*  40 */
-	/* 0x28 */ KEY_K,		/*  37 */
-	/* 0x29 */ KEY_SEMICOLON,	/*  39 */
-	/* 0x2a */ KEY_BACKSLASH,	/*  43 */
-	/* 0x2b */ KEY_COMMA,		/*  51 */
-	/* 0x2c */ KEY_SLASH,		/*  53 */
-	/* 0x2d */ KEY_N,		/*  49 */
-	/* 0x2e */ KEY_M,		/*  50 */
-	/* 0x2f */ KEY_DOT,		/*  52 */
-	/* 0x30 */ KEY_TAB,		/*  15 */
-	/* 0x31 */ KEY_SPACE,		/*  57 */
-	/* 0x32 */ KEY_GRAVE,		/*  41 */
-	/* 0x33 */ KEY_BACKSPACE,	/*  14 */
-	/* 0x34 */ KEY_KPENTER,		/*  96 */
-	/* 0x35 */ KEY_ESC,		/*   1 */
-	/* 0x36 */ KEY_LEFTCTRL,	/*  29 */
-	/* 0x37 */ KEY_LEFTMETA,	/* 125 */
-	/* 0x38 */ KEY_LEFTSHIFT,	/*  42 */
-	/* 0x39 */ KEY_CAPSLOCK,	/*  58 */
-	/* 0x3a */ KEY_LEFTALT,		/*  56 */
-	/* 0x3b */ KEY_LEFT,		/* 105 */
-	/* 0x3c */ KEY_RIGHT,		/* 106 */
-	/* 0x3d */ KEY_DOWN,		/* 108 */
-	/* 0x3e */ KEY_UP,		/* 103 */
-	/* 0x3f */ KEY_FN,		/* 0x1d0 */
-	/* 0x40 */ 0,
-	/* 0x41 */ KEY_KPDOT,		/*  83 */
-	/* 0x42 */ 0,
-	/* 0x43 */ KEY_KPASTERISK,	/*  55 */
-	/* 0x44 */ 0,
-	/* 0x45 */ KEY_KPPLUS,		/*  78 */
-	/* 0x46 */ 0,
-	/* 0x47 */ KEY_NUMLOCK,		/*  69 */
-	/* 0x48 */ 0,
-	/* 0x49 */ 0,
-	/* 0x4a */ 0,
-	/* 0x4b */ KEY_KPSLASH,		/*  98 */
-	/* 0x4c */ KEY_KPENTER,		/*  96 */
-	/* 0x4d */ 0,
-	/* 0x4e */ KEY_KPMINUS,		/*  74 */
-	/* 0x4f */ 0,
-	/* 0x50 */ 0,
-	/* 0x51 */ KEY_KPEQUAL,		/* 117 */
-	/* 0x52 */ KEY_KP0,		/*  82 */
-	/* 0x53 */ KEY_KP1,		/*  79 */
-	/* 0x54 */ KEY_KP2,		/*  80 */
-	/* 0x55 */ KEY_KP3,		/*  81 */
-	/* 0x56 */ KEY_KP4,		/*  75 */
-	/* 0x57 */ KEY_KP5,		/*  76 */
-	/* 0x58 */ KEY_KP6,		/*  77 */
-	/* 0x59 */ KEY_KP7,		/*  71 */
-	/* 0x5a */ 0,
-	/* 0x5b */ KEY_KP8,		/*  72 */
-	/* 0x5c */ KEY_KP9,		/*  73 */
-	/* 0x5d */ KEY_YEN,		/* 124 */
-	/* 0x5e */ KEY_RO,		/*  89 */
-	/* 0x5f */ KEY_KPCOMMA,		/* 121 */
-	/* 0x60 */ KEY_F5,		/*  63 */
-	/* 0x61 */ KEY_F6,		/*  64 */
-	/* 0x62 */ KEY_F7,		/*  65 */
-	/* 0x63 */ KEY_F3,		/*  61 */
-	/* 0x64 */ KEY_F8,		/*  66 */
-	/* 0x65 */ KEY_F9,		/*  67 */
-	/* 0x66 */ KEY_HANJA,		/* 123 */
-	/* 0x67 */ KEY_F11,		/*  87 */
-	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
-	/* 0x6a */ 0,
-	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
-	/* 0x6c */ 0,
-	/* 0x6d */ KEY_F10,		/*  68 */
-	/* 0x6e */ KEY_COMPOSE,		/* 127 */
-	/* 0x6f */ KEY_F12,		/*  88 */
-	/* 0x70 */ 0,
-	/* 0x71 */ KEY_PAUSE,		/* 119 */
-	/* 0x72 */ KEY_INSERT,		/* 110 */
-	/* 0x73 */ KEY_HOME,		/* 102 */
-	/* 0x74 */ KEY_PAGEUP,		/* 104 */
-	/* 0x75 */ KEY_DELETE,		/* 111 */
-	/* 0x76 */ KEY_F4,		/*  62 */
-	/* 0x77 */ KEY_END,		/* 107 */
-	/* 0x78 */ KEY_F2,		/*  60 */
-	/* 0x79 */ KEY_PAGEDOWN,	/* 109 */
-	/* 0x7a */ KEY_F1,		/*  59 */
-	/* 0x7b */ KEY_RIGHTSHIFT,	/*  54 */
-	/* 0x7c */ KEY_RIGHTALT,	/* 100 */
-	/* 0x7d */ KEY_RIGHTCTRL,	/*  97 */
-	/* 0x7e */ KEY_RIGHTMETA,	/* 126 */
-	/* 0x7f */ KEY_POWER,		/* 116 */
+	[0x00] = KEY_A,		      /*  30 */
+	[0x01] = KEY_S,		      /*  31 */
+	[0x02] = KEY_D,		      /*  32 */
+	[0x03] = KEY_F,		      /*  33 */
+	[0x04] = KEY_H,		      /*  35 */
+	[0x05] = KEY_G,		      /*  34 */
+	[0x06] = KEY_Z,		      /*  44 */
+	[0x07] = KEY_X,		      /*  45 */
+	[0x08] = KEY_C,		      /*  46 */
+	[0x09] = KEY_V,		      /*  47 */
+	[0x0a] = KEY_102ND,		   /*  86 */
+	[0x0b] = KEY_B,		      /*  48 */
+	[0x0c] = KEY_Q,		      /*  16 */
+	[0x0d] = KEY_W,		      /*  17 */
+	[0x0e] = KEY_E,		      /*  18 */
+	[0x0f] = KEY_R,		      /*  19 */
+	[0x10] = KEY_Y,		      /*  21 */
+	[0x11] = KEY_T,		      /*  20 */
+	[0x12] = KEY_1,		      /*   2 */
+	[0x13] = KEY_2,		      /*   3 */
+	[0x14] = KEY_3,		      /*   4 */
+	[0x15] = KEY_4,		      /*   5 */
+	[0x16] = KEY_6,		      /*   7 */
+	[0x17] = KEY_5,		      /*   6 */
+	[0x18] = KEY_EQUAL,		   /*  13 */
+	[0x19] = KEY_9,		      /*  10 */
+	[0x1a] = KEY_7,		      /*   8 */
+	[0x1b] = KEY_MINUS,		   /*  12 */
+	[0x1c] = KEY_8,		      /*   9 */
+	[0x1d] = KEY_0,		      /*  11 */
+	[0x1e] = KEY_RIGHTBRACE,	/*  27 */
+	[0x1f] = KEY_O,		      /*  24 */
+	[0x20] = KEY_U,		      /*  22 */
+	[0x21] = KEY_LEFTBRACE,	   /*  26 */
+	[0x22] = KEY_I,		      /*  23 */
+	[0x23] = KEY_P,		      /*  25 */
+	[0x24] = KEY_ENTER,		   /*  28 */
+	[0x25] = KEY_L,		      /*  38 */
+	[0x26] = KEY_J,		      /*  36 */
+	[0x27] = KEY_APOSTROPHE,	/*  40 */
+	[0x28] = KEY_K,		      /*  37 */
+	[0x29] = KEY_SEMICOLON,	   /*  39 */
+	[0x2a] = KEY_BACKSLASH,	   /*  43 */
+	[0x2b] = KEY_COMMA,		   /*  51 */
+	[0x2c] = KEY_SLASH,		   /*  53 */
+	[0x2d] = KEY_N,		      /*  49 */
+	[0x2e] = KEY_M,		      /*  50 */
+	[0x2f] = KEY_DOT,		      /*  52 */
+	[0x30] = KEY_TAB,		      /*  15 */
+	[0x31] = KEY_SPACE,		   /*  57 */
+	[0x32] = KEY_GRAVE,		   /*  41 */
+	[0x33] = KEY_BACKSPACE,	   /*  14 */
+	[0x34] = KEY_KPENTER,		/*  96 */
+	[0x35] = KEY_ESC,		      /*   1 */
+	[0x36] = KEY_LEFTCTRL,	   /*  29 */
+	[0x37] = KEY_LEFTMETA,	   /* 125 */
+	[0x38] = KEY_LEFTSHIFT,	   /*  42 */
+	[0x39] = KEY_CAPSLOCK,	   /*  58 */
+	[0x3a] = KEY_LEFTALT,		/*  56 */
+	[0x3b] = KEY_LEFT,		   /* 105 */
+	[0x3c] = KEY_RIGHT,		   /* 106 */
+	[0x3d] = KEY_DOWN,		   /* 108 */
+	[0x3e] = KEY_UP,		      /* 103 */
+	[0x3f] = KEY_FN,		      /* 0x1d0 */
+	[0x40] = 0,
+	[0x41] = KEY_KPDOT,		   /*  83 */
+	[0x42] = 0,
+	[0x43] = KEY_KPASTERISK,	/*  55 */
+	[0x44] = 0,
+	[0x45] = KEY_KPPLUS,		   /*  78 */
+	[0x46] = 0,
+	[0x47] = KEY_NUMLOCK,		/*  69 */
+	[0x48] = 0,
+	[0x49] = 0,
+	[0x4a] = 0,
+	[0x4b] = KEY_KPSLASH,		/*  98 */
+	[0x4c] = KEY_KPENTER,		/*  96 */
+	[0x4d] = 0,
+	[0x4e] = KEY_KPMINUS,		/*  74 */
+	[0x4f] = 0,
+	[0x50] = 0,
+	[0x51] = KEY_KPEQUAL,		/* 117 */
+	[0x52] = KEY_KP0,		      /*  82 */
+	[0x53] = KEY_KP1,		      /*  79 */
+	[0x54] = KEY_KP2,		      /*  80 */
+	[0x55] = KEY_KP3,		      /*  81 */
+	[0x56] = KEY_KP4,		      /*  75 */
+	[0x57] = KEY_KP5,		      /*  76 */
+	[0x58] = KEY_KP6,		      /*  77 */
+	[0x59] = KEY_KP7,		      /*  71 */
+	[0x5a] = 0,
+	[0x5b] = KEY_KP8,		      /*  72 */
+	[0x5c] = KEY_KP9,		      /*  73 */
+	[0x5d] = KEY_YEN,		      /* 124 */
+	[0x5e] = KEY_RO,		      /*  89 */
+	[0x5f] = KEY_KPCOMMA,		/* 121 */
+	[0x60] = KEY_F5,		      /*  63 */
+	[0x61] = KEY_F6,		      /*  64 */
+	[0x62] = KEY_F7,		      /*  65 */
+	[0x63] = KEY_F3,		      /*  61 */
+	[0x64] = KEY_F8,		      /*  66 */
+	[0x65] = KEY_F9,		      /*  67 */
+	[0x66] = KEY_HANJA,		   /* 123 */
+	[0x67] = KEY_F11,		      /*  87 */
+	[0x68] = KEY_HANGEUL,		/* 122 */
+	[0x69] = KEY_SYSRQ,		   /*  99 */
+	[0x6a] = 0,
+	[0x6b] = KEY_SCROLLLOCK,	/*  70 */
+	[0x6c] = 0,
+	[0x6d] = KEY_F10,		      /*  68 */
+	[0x6e] = KEY_COMPOSE,		/* 127 */
+	[0x6f] = KEY_F12,		      /*  88 */
+	[0x70] = 0,
+	[0x71] = KEY_PAUSE,		   /* 119 */
+	[0x72] = KEY_INSERT,		   /* 110 */
+	[0x73] = KEY_HOME,		   /* 102 */
+	[0x74] = KEY_PAGEUP,		   /* 104 */
+	[0x75] = KEY_DELETE,		   /* 111 */
+	[0x76] = KEY_F4,		      /*  62 */
+	[0x77] = KEY_END,		      /* 107 */
+	[0x78] = KEY_F2,		      /*  60 */
+	[0x79] = KEY_PAGEDOWN,	   /* 109 */
+	[0x7a] = KEY_F1,		      /*  59 */
+	[0x7b] = KEY_RIGHTSHIFT,	/*  54 */
+	[0x7c] = KEY_RIGHTALT,	   /* 100 */
+	[0x7d] = KEY_RIGHTCTRL,	   /*  97 */
+	[0x7e] = KEY_RIGHTMETA,	   /* 126 */
+	[0x7f] = KEY_POWER,		   /* 116 */
 };
 
 struct adbhid {
-- 
2.35.1

[PATCH 15/22] macintosh: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/macintosh/adbhid.c | 256 ++++++++++++++++++-------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 994ba5cb3678..6e44623cf084 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -77,134 +77,134 @@ static struct notifier_block adbhid_adb_notifier = {
 #define ADB_KEY_POWER		0x7f
 
 static const u16 adb_to_linux_keycodes[128] = {
-	/* 0x00 */ KEY_A, 		/*  30 */
-	/* 0x01 */ KEY_S, 		/*  31 */
-	/* 0x02 */ KEY_D,		/*  32 */
-	/* 0x03 */ KEY_F,		/*  33 */
-	/* 0x04 */ KEY_H,		/*  35 */
-	/* 0x05 */ KEY_G,		/*  34 */
-	/* 0x06 */ KEY_Z,		/*  44 */
-	/* 0x07 */ KEY_X,		/*  45 */
-	/* 0x08 */ KEY_C,		/*  46 */
-	/* 0x09 */ KEY_V,		/*  47 */
-	/* 0x0a */ KEY_102ND,		/*  86 */
-	/* 0x0b */ KEY_B,		/*  48 */
-	/* 0x0c */ KEY_Q,		/*  16 */
-	/* 0x0d */ KEY_W,		/*  17 */
-	/* 0x0e */ KEY_E,		/*  18 */
-	/* 0x0f */ KEY_R,		/*  19 */
-	/* 0x10 */ KEY_Y,		/*  21 */
-	/* 0x11 */ KEY_T,		/*  20 */
-	/* 0x12 */ KEY_1,		/*   2 */
-	/* 0x13 */ KEY_2,		/*   3 */
-	/* 0x14 */ KEY_3,		/*   4 */
-	/* 0x15 */ KEY_4,		/*   5 */
-	/* 0x16 */ KEY_6,		/*   7 */
-	/* 0x17 */ KEY_5,		/*   6 */
-	/* 0x18 */ KEY_EQUAL,		/*  13 */
-	/* 0x19 */ KEY_9,		/*  10 */
-	/* 0x1a */ KEY_7,		/*   8 */
-	/* 0x1b */ KEY_MINUS,		/*  12 */
-	/* 0x1c */ KEY_8,		/*   9 */
-	/* 0x1d */ KEY_0,		/*  11 */
-	/* 0x1e */ KEY_RIGHTBRACE,	/*  27 */
-	/* 0x1f */ KEY_O,		/*  24 */
-	/* 0x20 */ KEY_U,		/*  22 */
-	/* 0x21 */ KEY_LEFTBRACE,	/*  26 */
-	/* 0x22 */ KEY_I,		/*  23 */
-	/* 0x23 */ KEY_P,		/*  25 */
-	/* 0x24 */ KEY_ENTER,		/*  28 */
-	/* 0x25 */ KEY_L,		/*  38 */
-	/* 0x26 */ KEY_J,		/*  36 */
-	/* 0x27 */ KEY_APOSTROPHE,	/*  40 */
-	/* 0x28 */ KEY_K,		/*  37 */
-	/* 0x29 */ KEY_SEMICOLON,	/*  39 */
-	/* 0x2a */ KEY_BACKSLASH,	/*  43 */
-	/* 0x2b */ KEY_COMMA,		/*  51 */
-	/* 0x2c */ KEY_SLASH,		/*  53 */
-	/* 0x2d */ KEY_N,		/*  49 */
-	/* 0x2e */ KEY_M,		/*  50 */
-	/* 0x2f */ KEY_DOT,		/*  52 */
-	/* 0x30 */ KEY_TAB,		/*  15 */
-	/* 0x31 */ KEY_SPACE,		/*  57 */
-	/* 0x32 */ KEY_GRAVE,		/*  41 */
-	/* 0x33 */ KEY_BACKSPACE,	/*  14 */
-	/* 0x34 */ KEY_KPENTER,		/*  96 */
-	/* 0x35 */ KEY_ESC,		/*   1 */
-	/* 0x36 */ KEY_LEFTCTRL,	/*  29 */
-	/* 0x37 */ KEY_LEFTMETA,	/* 125 */
-	/* 0x38 */ KEY_LEFTSHIFT,	/*  42 */
-	/* 0x39 */ KEY_CAPSLOCK,	/*  58 */
-	/* 0x3a */ KEY_LEFTALT,		/*  56 */
-	/* 0x3b */ KEY_LEFT,		/* 105 */
-	/* 0x3c */ KEY_RIGHT,		/* 106 */
-	/* 0x3d */ KEY_DOWN,		/* 108 */
-	/* 0x3e */ KEY_UP,		/* 103 */
-	/* 0x3f */ KEY_FN,		/* 0x1d0 */
-	/* 0x40 */ 0,
-	/* 0x41 */ KEY_KPDOT,		/*  83 */
-	/* 0x42 */ 0,
-	/* 0x43 */ KEY_KPASTERISK,	/*  55 */
-	/* 0x44 */ 0,
-	/* 0x45 */ KEY_KPPLUS,		/*  78 */
-	/* 0x46 */ 0,
-	/* 0x47 */ KEY_NUMLOCK,		/*  69 */
-	/* 0x48 */ 0,
-	/* 0x49 */ 0,
-	/* 0x4a */ 0,
-	/* 0x4b */ KEY_KPSLASH,		/*  98 */
-	/* 0x4c */ KEY_KPENTER,		/*  96 */
-	/* 0x4d */ 0,
-	/* 0x4e */ KEY_KPMINUS,		/*  74 */
-	/* 0x4f */ 0,
-	/* 0x50 */ 0,
-	/* 0x51 */ KEY_KPEQUAL,		/* 117 */
-	/* 0x52 */ KEY_KP0,		/*  82 */
-	/* 0x53 */ KEY_KP1,		/*  79 */
-	/* 0x54 */ KEY_KP2,		/*  80 */
-	/* 0x55 */ KEY_KP3,		/*  81 */
-	/* 0x56 */ KEY_KP4,		/*  75 */
-	/* 0x57 */ KEY_KP5,		/*  76 */
-	/* 0x58 */ KEY_KP6,		/*  77 */
-	/* 0x59 */ KEY_KP7,		/*  71 */
-	/* 0x5a */ 0,
-	/* 0x5b */ KEY_KP8,		/*  72 */
-	/* 0x5c */ KEY_KP9,		/*  73 */
-	/* 0x5d */ KEY_YEN,		/* 124 */
-	/* 0x5e */ KEY_RO,		/*  89 */
-	/* 0x5f */ KEY_KPCOMMA,		/* 121 */
-	/* 0x60 */ KEY_F5,		/*  63 */
-	/* 0x61 */ KEY_F6,		/*  64 */
-	/* 0x62 */ KEY_F7,		/*  65 */
-	/* 0x63 */ KEY_F3,		/*  61 */
-	/* 0x64 */ KEY_F8,		/*  66 */
-	/* 0x65 */ KEY_F9,		/*  67 */
-	/* 0x66 */ KEY_HANJA,		/* 123 */
-	/* 0x67 */ KEY_F11,		/*  87 */
-	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
-	/* 0x6a */ 0,
-	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
-	/* 0x6c */ 0,
-	/* 0x6d */ KEY_F10,		/*  68 */
-	/* 0x6e */ KEY_COMPOSE,		/* 127 */
-	/* 0x6f */ KEY_F12,		/*  88 */
-	/* 0x70 */ 0,
-	/* 0x71 */ KEY_PAUSE,		/* 119 */
-	/* 0x72 */ KEY_INSERT,		/* 110 */
-	/* 0x73 */ KEY_HOME,		/* 102 */
-	/* 0x74 */ KEY_PAGEUP,		/* 104 */
-	/* 0x75 */ KEY_DELETE,		/* 111 */
-	/* 0x76 */ KEY_F4,		/*  62 */
-	/* 0x77 */ KEY_END,		/* 107 */
-	/* 0x78 */ KEY_F2,		/*  60 */
-	/* 0x79 */ KEY_PAGEDOWN,	/* 109 */
-	/* 0x7a */ KEY_F1,		/*  59 */
-	/* 0x7b */ KEY_RIGHTSHIFT,	/*  54 */
-	/* 0x7c */ KEY_RIGHTALT,	/* 100 */
-	/* 0x7d */ KEY_RIGHTCTRL,	/*  97 */
-	/* 0x7e */ KEY_RIGHTMETA,	/* 126 */
-	/* 0x7f */ KEY_POWER,		/* 116 */
+	[0x00] = KEY_A,		      /*  30 */
+	[0x01] = KEY_S,		      /*  31 */
+	[0x02] = KEY_D,		      /*  32 */
+	[0x03] = KEY_F,		      /*  33 */
+	[0x04] = KEY_H,		      /*  35 */
+	[0x05] = KEY_G,		      /*  34 */
+	[0x06] = KEY_Z,		      /*  44 */
+	[0x07] = KEY_X,		      /*  45 */
+	[0x08] = KEY_C,		      /*  46 */
+	[0x09] = KEY_V,		      /*  47 */
+	[0x0a] = KEY_102ND,		   /*  86 */
+	[0x0b] = KEY_B,		      /*  48 */
+	[0x0c] = KEY_Q,		      /*  16 */
+	[0x0d] = KEY_W,		      /*  17 */
+	[0x0e] = KEY_E,		      /*  18 */
+	[0x0f] = KEY_R,		      /*  19 */
+	[0x10] = KEY_Y,		      /*  21 */
+	[0x11] = KEY_T,		      /*  20 */
+	[0x12] = KEY_1,		      /*   2 */
+	[0x13] = KEY_2,		      /*   3 */
+	[0x14] = KEY_3,		      /*   4 */
+	[0x15] = KEY_4,		      /*   5 */
+	[0x16] = KEY_6,		      /*   7 */
+	[0x17] = KEY_5,		      /*   6 */
+	[0x18] = KEY_EQUAL,		   /*  13 */
+	[0x19] = KEY_9,		      /*  10 */
+	[0x1a] = KEY_7,		      /*   8 */
+	[0x1b] = KEY_MINUS,		   /*  12 */
+	[0x1c] = KEY_8,		      /*   9 */
+	[0x1d] = KEY_0,		      /*  11 */
+	[0x1e] = KEY_RIGHTBRACE,	/*  27 */
+	[0x1f] = KEY_O,		      /*  24 */
+	[0x20] = KEY_U,		      /*  22 */
+	[0x21] = KEY_LEFTBRACE,	   /*  26 */
+	[0x22] = KEY_I,		      /*  23 */
+	[0x23] = KEY_P,		      /*  25 */
+	[0x24] = KEY_ENTER,		   /*  28 */
+	[0x25] = KEY_L,		      /*  38 */
+	[0x26] = KEY_J,		      /*  36 */
+	[0x27] = KEY_APOSTROPHE,	/*  40 */
+	[0x28] = KEY_K,		      /*  37 */
+	[0x29] = KEY_SEMICOLON,	   /*  39 */
+	[0x2a] = KEY_BACKSLASH,	   /*  43 */
+	[0x2b] = KEY_COMMA,		   /*  51 */
+	[0x2c] = KEY_SLASH,		   /*  53 */
+	[0x2d] = KEY_N,		      /*  49 */
+	[0x2e] = KEY_M,		      /*  50 */
+	[0x2f] = KEY_DOT,		      /*  52 */
+	[0x30] = KEY_TAB,		      /*  15 */
+	[0x31] = KEY_SPACE,		   /*  57 */
+	[0x32] = KEY_GRAVE,		   /*  41 */
+	[0x33] = KEY_BACKSPACE,	   /*  14 */
+	[0x34] = KEY_KPENTER,		/*  96 */
+	[0x35] = KEY_ESC,		      /*   1 */
+	[0x36] = KEY_LEFTCTRL,	   /*  29 */
+	[0x37] = KEY_LEFTMETA,	   /* 125 */
+	[0x38] = KEY_LEFTSHIFT,	   /*  42 */
+	[0x39] = KEY_CAPSLOCK,	   /*  58 */
+	[0x3a] = KEY_LEFTALT,		/*  56 */
+	[0x3b] = KEY_LEFT,		   /* 105 */
+	[0x3c] = KEY_RIGHT,		   /* 106 */
+	[0x3d] = KEY_DOWN,		   /* 108 */
+	[0x3e] = KEY_UP,		      /* 103 */
+	[0x3f] = KEY_FN,		      /* 0x1d0 */
+	[0x40] = 0,
+	[0x41] = KEY_KPDOT,		   /*  83 */
+	[0x42] = 0,
+	[0x43] = KEY_KPASTERISK,	/*  55 */
+	[0x44] = 0,
+	[0x45] = KEY_KPPLUS,		   /*  78 */
+	[0x46] = 0,
+	[0x47] = KEY_NUMLOCK,		/*  69 */
+	[0x48] = 0,
+	[0x49] = 0,
+	[0x4a] = 0,
+	[0x4b] = KEY_KPSLASH,		/*  98 */
+	[0x4c] = KEY_KPENTER,		/*  96 */
+	[0x4d] = 0,
+	[0x4e] = KEY_KPMINUS,		/*  74 */
+	[0x4f] = 0,
+	[0x50] = 0,
+	[0x51] = KEY_KPEQUAL,		/* 117 */
+	[0x52] = KEY_KP0,		      /*  82 */
+	[0x53] = KEY_KP1,		      /*  79 */
+	[0x54] = KEY_KP2,		      /*  80 */
+	[0x55] = KEY_KP3,		      /*  81 */
+	[0x56] = KEY_KP4,		      /*  75 */
+	[0x57] = KEY_KP5,		      /*  76 */
+	[0x58] = KEY_KP6,		      /*  77 */
+	[0x59] = KEY_KP7,		      /*  71 */
+	[0x5a] = 0,
+	[0x5b] = KEY_KP8,		      /*  72 */
+	[0x5c] = KEY_KP9,		      /*  73 */
+	[0x5d] = KEY_YEN,		      /* 124 */
+	[0x5e] = KEY_RO,		      /*  89 */
+	[0x5f] = KEY_KPCOMMA,		/* 121 */
+	[0x60] = KEY_F5,		      /*  63 */
+	[0x61] = KEY_F6,		      /*  64 */
+	[0x62] = KEY_F7,		      /*  65 */
+	[0x63] = KEY_F3,		      /*  61 */
+	[0x64] = KEY_F8,		      /*  66 */
+	[0x65] = KEY_F9,		      /*  67 */
+	[0x66] = KEY_HANJA,		   /* 123 */
+	[0x67] = KEY_F11,		      /*  87 */
+	[0x68] = KEY_HANGEUL,		/* 122 */
+	[0x69] = KEY_SYSRQ,		   /*  99 */
+	[0x6a] = 0,
+	[0x6b] = KEY_SCROLLLOCK,	/*  70 */
+	[0x6c] = 0,
+	[0x6d] = KEY_F10,		      /*  68 */
+	[0x6e] = KEY_COMPOSE,		/* 127 */
+	[0x6f] = KEY_F12,		      /*  88 */
+	[0x70] = 0,
+	[0x71] = KEY_PAUSE,		   /* 119 */
+	[0x72] = KEY_INSERT,		   /* 110 */
+	[0x73] = KEY_HOME,		   /* 102 */
+	[0x74] = KEY_PAGEUP,		   /* 104 */
+	[0x75] = KEY_DELETE,		   /* 111 */
+	[0x76] = KEY_F4,		      /*  62 */
+	[0x77] = KEY_END,		      /* 107 */
+	[0x78] = KEY_F2,		      /*  60 */
+	[0x79] = KEY_PAGEDOWN,	   /* 109 */
+	[0x7a] = KEY_F1,		      /*  59 */
+	[0x7b] = KEY_RIGHTSHIFT,	/*  54 */
+	[0x7c] = KEY_RIGHTALT,	   /* 100 */
+	[0x7d] = KEY_RIGHTCTRL,	   /*  97 */
+	[0x7e] = KEY_RIGHTMETA,	   /* 126 */
+	[0x7f] = KEY_POWER,		   /* 116 */
 };
 
 struct adbhid {
-- 
2.35.1

[PATCH 15/22] macintosh: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/macintosh/adbhid.c | 256 ++++++++++++++++++-------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 994ba5cb3678..6e44623cf084 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -77,134 +77,134 @@ static struct notifier_block adbhid_adb_notifier = {
 #define ADB_KEY_POWER		0x7f
 
 static const u16 adb_to_linux_keycodes[128] = {
-	/* 0x00 */ KEY_A, 		/*  30 */
-	/* 0x01 */ KEY_S, 		/*  31 */
-	/* 0x02 */ KEY_D,		/*  32 */
-	/* 0x03 */ KEY_F,		/*  33 */
-	/* 0x04 */ KEY_H,		/*  35 */
-	/* 0x05 */ KEY_G,		/*  34 */
-	/* 0x06 */ KEY_Z,		/*  44 */
-	/* 0x07 */ KEY_X,		/*  45 */
-	/* 0x08 */ KEY_C,		/*  46 */
-	/* 0x09 */ KEY_V,		/*  47 */
-	/* 0x0a */ KEY_102ND,		/*  86 */
-	/* 0x0b */ KEY_B,		/*  48 */
-	/* 0x0c */ KEY_Q,		/*  16 */
-	/* 0x0d */ KEY_W,		/*  17 */
-	/* 0x0e */ KEY_E,		/*  18 */
-	/* 0x0f */ KEY_R,		/*  19 */
-	/* 0x10 */ KEY_Y,		/*  21 */
-	/* 0x11 */ KEY_T,		/*  20 */
-	/* 0x12 */ KEY_1,		/*   2 */
-	/* 0x13 */ KEY_2,		/*   3 */
-	/* 0x14 */ KEY_3,		/*   4 */
-	/* 0x15 */ KEY_4,		/*   5 */
-	/* 0x16 */ KEY_6,		/*   7 */
-	/* 0x17 */ KEY_5,		/*   6 */
-	/* 0x18 */ KEY_EQUAL,		/*  13 */
-	/* 0x19 */ KEY_9,		/*  10 */
-	/* 0x1a */ KEY_7,		/*   8 */
-	/* 0x1b */ KEY_MINUS,		/*  12 */
-	/* 0x1c */ KEY_8,		/*   9 */
-	/* 0x1d */ KEY_0,		/*  11 */
-	/* 0x1e */ KEY_RIGHTBRACE,	/*  27 */
-	/* 0x1f */ KEY_O,		/*  24 */
-	/* 0x20 */ KEY_U,		/*  22 */
-	/* 0x21 */ KEY_LEFTBRACE,	/*  26 */
-	/* 0x22 */ KEY_I,		/*  23 */
-	/* 0x23 */ KEY_P,		/*  25 */
-	/* 0x24 */ KEY_ENTER,		/*  28 */
-	/* 0x25 */ KEY_L,		/*  38 */
-	/* 0x26 */ KEY_J,		/*  36 */
-	/* 0x27 */ KEY_APOSTROPHE,	/*  40 */
-	/* 0x28 */ KEY_K,		/*  37 */
-	/* 0x29 */ KEY_SEMICOLON,	/*  39 */
-	/* 0x2a */ KEY_BACKSLASH,	/*  43 */
-	/* 0x2b */ KEY_COMMA,		/*  51 */
-	/* 0x2c */ KEY_SLASH,		/*  53 */
-	/* 0x2d */ KEY_N,		/*  49 */
-	/* 0x2e */ KEY_M,		/*  50 */
-	/* 0x2f */ KEY_DOT,		/*  52 */
-	/* 0x30 */ KEY_TAB,		/*  15 */
-	/* 0x31 */ KEY_SPACE,		/*  57 */
-	/* 0x32 */ KEY_GRAVE,		/*  41 */
-	/* 0x33 */ KEY_BACKSPACE,	/*  14 */
-	/* 0x34 */ KEY_KPENTER,		/*  96 */
-	/* 0x35 */ KEY_ESC,		/*   1 */
-	/* 0x36 */ KEY_LEFTCTRL,	/*  29 */
-	/* 0x37 */ KEY_LEFTMETA,	/* 125 */
-	/* 0x38 */ KEY_LEFTSHIFT,	/*  42 */
-	/* 0x39 */ KEY_CAPSLOCK,	/*  58 */
-	/* 0x3a */ KEY_LEFTALT,		/*  56 */
-	/* 0x3b */ KEY_LEFT,		/* 105 */
-	/* 0x3c */ KEY_RIGHT,		/* 106 */
-	/* 0x3d */ KEY_DOWN,		/* 108 */
-	/* 0x3e */ KEY_UP,		/* 103 */
-	/* 0x3f */ KEY_FN,		/* 0x1d0 */
-	/* 0x40 */ 0,
-	/* 0x41 */ KEY_KPDOT,		/*  83 */
-	/* 0x42 */ 0,
-	/* 0x43 */ KEY_KPASTERISK,	/*  55 */
-	/* 0x44 */ 0,
-	/* 0x45 */ KEY_KPPLUS,		/*  78 */
-	/* 0x46 */ 0,
-	/* 0x47 */ KEY_NUMLOCK,		/*  69 */
-	/* 0x48 */ 0,
-	/* 0x49 */ 0,
-	/* 0x4a */ 0,
-	/* 0x4b */ KEY_KPSLASH,		/*  98 */
-	/* 0x4c */ KEY_KPENTER,		/*  96 */
-	/* 0x4d */ 0,
-	/* 0x4e */ KEY_KPMINUS,		/*  74 */
-	/* 0x4f */ 0,
-	/* 0x50 */ 0,
-	/* 0x51 */ KEY_KPEQUAL,		/* 117 */
-	/* 0x52 */ KEY_KP0,		/*  82 */
-	/* 0x53 */ KEY_KP1,		/*  79 */
-	/* 0x54 */ KEY_KP2,		/*  80 */
-	/* 0x55 */ KEY_KP3,		/*  81 */
-	/* 0x56 */ KEY_KP4,		/*  75 */
-	/* 0x57 */ KEY_KP5,		/*  76 */
-	/* 0x58 */ KEY_KP6,		/*  77 */
-	/* 0x59 */ KEY_KP7,		/*  71 */
-	/* 0x5a */ 0,
-	/* 0x5b */ KEY_KP8,		/*  72 */
-	/* 0x5c */ KEY_KP9,		/*  73 */
-	/* 0x5d */ KEY_YEN,		/* 124 */
-	/* 0x5e */ KEY_RO,		/*  89 */
-	/* 0x5f */ KEY_KPCOMMA,		/* 121 */
-	/* 0x60 */ KEY_F5,		/*  63 */
-	/* 0x61 */ KEY_F6,		/*  64 */
-	/* 0x62 */ KEY_F7,		/*  65 */
-	/* 0x63 */ KEY_F3,		/*  61 */
-	/* 0x64 */ KEY_F8,		/*  66 */
-	/* 0x65 */ KEY_F9,		/*  67 */
-	/* 0x66 */ KEY_HANJA,		/* 123 */
-	/* 0x67 */ KEY_F11,		/*  87 */
-	/* 0x68 */ KEY_HANGEUL,		/* 122 */
-	/* 0x69 */ KEY_SYSRQ,		/*  99 */
-	/* 0x6a */ 0,
-	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */
-	/* 0x6c */ 0,
-	/* 0x6d */ KEY_F10,		/*  68 */
-	/* 0x6e */ KEY_COMPOSE,		/* 127 */
-	/* 0x6f */ KEY_F12,		/*  88 */
-	/* 0x70 */ 0,
-	/* 0x71 */ KEY_PAUSE,		/* 119 */
-	/* 0x72 */ KEY_INSERT,		/* 110 */
-	/* 0x73 */ KEY_HOME,		/* 102 */
-	/* 0x74 */ KEY_PAGEUP,		/* 104 */
-	/* 0x75 */ KEY_DELETE,		/* 111 */
-	/* 0x76 */ KEY_F4,		/*  62 */
-	/* 0x77 */ KEY_END,		/* 107 */
-	/* 0x78 */ KEY_F2,		/*  60 */
-	/* 0x79 */ KEY_PAGEDOWN,	/* 109 */
-	/* 0x7a */ KEY_F1,		/*  59 */
-	/* 0x7b */ KEY_RIGHTSHIFT,	/*  54 */
-	/* 0x7c */ KEY_RIGHTALT,	/* 100 */
-	/* 0x7d */ KEY_RIGHTCTRL,	/*  97 */
-	/* 0x7e */ KEY_RIGHTMETA,	/* 126 */
-	/* 0x7f */ KEY_POWER,		/* 116 */
+	[0x00] = KEY_A,		      /*  30 */
+	[0x01] = KEY_S,		      /*  31 */
+	[0x02] = KEY_D,		      /*  32 */
+	[0x03] = KEY_F,		      /*  33 */
+	[0x04] = KEY_H,		      /*  35 */
+	[0x05] = KEY_G,		      /*  34 */
+	[0x06] = KEY_Z,		      /*  44 */
+	[0x07] = KEY_X,		      /*  45 */
+	[0x08] = KEY_C,		      /*  46 */
+	[0x09] = KEY_V,		      /*  47 */
+	[0x0a] = KEY_102ND,		   /*  86 */
+	[0x0b] = KEY_B,		      /*  48 */
+	[0x0c] = KEY_Q,		      /*  16 */
+	[0x0d] = KEY_W,		      /*  17 */
+	[0x0e] = KEY_E,		      /*  18 */
+	[0x0f] = KEY_R,		      /*  19 */
+	[0x10] = KEY_Y,		      /*  21 */
+	[0x11] = KEY_T,		      /*  20 */
+	[0x12] = KEY_1,		      /*   2 */
+	[0x13] = KEY_2,		      /*   3 */
+	[0x14] = KEY_3,		      /*   4 */
+	[0x15] = KEY_4,		      /*   5 */
+	[0x16] = KEY_6,		      /*   7 */
+	[0x17] = KEY_5,		      /*   6 */
+	[0x18] = KEY_EQUAL,		   /*  13 */
+	[0x19] = KEY_9,		      /*  10 */
+	[0x1a] = KEY_7,		      /*   8 */
+	[0x1b] = KEY_MINUS,		   /*  12 */
+	[0x1c] = KEY_8,		      /*   9 */
+	[0x1d] = KEY_0,		      /*  11 */
+	[0x1e] = KEY_RIGHTBRACE,	/*  27 */
+	[0x1f] = KEY_O,		      /*  24 */
+	[0x20] = KEY_U,		      /*  22 */
+	[0x21] = KEY_LEFTBRACE,	   /*  26 */
+	[0x22] = KEY_I,		      /*  23 */
+	[0x23] = KEY_P,		      /*  25 */
+	[0x24] = KEY_ENTER,		   /*  28 */
+	[0x25] = KEY_L,		      /*  38 */
+	[0x26] = KEY_J,		      /*  36 */
+	[0x27] = KEY_APOSTROPHE,	/*  40 */
+	[0x28] = KEY_K,		      /*  37 */
+	[0x29] = KEY_SEMICOLON,	   /*  39 */
+	[0x2a] = KEY_BACKSLASH,	   /*  43 */
+	[0x2b] = KEY_COMMA,		   /*  51 */
+	[0x2c] = KEY_SLASH,		   /*  53 */
+	[0x2d] = KEY_N,		      /*  49 */
+	[0x2e] = KEY_M,		      /*  50 */
+	[0x2f] = KEY_DOT,		      /*  52 */
+	[0x30] = KEY_TAB,		      /*  15 */
+	[0x31] = KEY_SPACE,		   /*  57 */
+	[0x32] = KEY_GRAVE,		   /*  41 */
+	[0x33] = KEY_BACKSPACE,	   /*  14 */
+	[0x34] = KEY_KPENTER,		/*  96 */
+	[0x35] = KEY_ESC,		      /*   1 */
+	[0x36] = KEY_LEFTCTRL,	   /*  29 */
+	[0x37] = KEY_LEFTMETA,	   /* 125 */
+	[0x38] = KEY_LEFTSHIFT,	   /*  42 */
+	[0x39] = KEY_CAPSLOCK,	   /*  58 */
+	[0x3a] = KEY_LEFTALT,		/*  56 */
+	[0x3b] = KEY_LEFT,		   /* 105 */
+	[0x3c] = KEY_RIGHT,		   /* 106 */
+	[0x3d] = KEY_DOWN,		   /* 108 */
+	[0x3e] = KEY_UP,		      /* 103 */
+	[0x3f] = KEY_FN,		      /* 0x1d0 */
+	[0x40] = 0,
+	[0x41] = KEY_KPDOT,		   /*  83 */
+	[0x42] = 0,
+	[0x43] = KEY_KPASTERISK,	/*  55 */
+	[0x44] = 0,
+	[0x45] = KEY_KPPLUS,		   /*  78 */
+	[0x46] = 0,
+	[0x47] = KEY_NUMLOCK,		/*  69 */
+	[0x48] = 0,
+	[0x49] = 0,
+	[0x4a] = 0,
+	[0x4b] = KEY_KPSLASH,		/*  98 */
+	[0x4c] = KEY_KPENTER,		/*  96 */
+	[0x4d] = 0,
+	[0x4e] = KEY_KPMINUS,		/*  74 */
+	[0x4f] = 0,
+	[0x50] = 0,
+	[0x51] = KEY_KPEQUAL,		/* 117 */
+	[0x52] = KEY_KP0,		      /*  82 */
+	[0x53] = KEY_KP1,		      /*  79 */
+	[0x54] = KEY_KP2,		      /*  80 */
+	[0x55] = KEY_KP3,		      /*  81 */
+	[0x56] = KEY_KP4,		      /*  75 */
+	[0x57] = KEY_KP5,		      /*  76 */
+	[0x58] = KEY_KP6,		      /*  77 */
+	[0x59] = KEY_KP7,		      /*  71 */
+	[0x5a] = 0,
+	[0x5b] = KEY_KP8,		      /*  72 */
+	[0x5c] = KEY_KP9,		      /*  73 */
+	[0x5d] = KEY_YEN,		      /* 124 */
+	[0x5e] = KEY_RO,		      /*  89 */
+	[0x5f] = KEY_KPCOMMA,		/* 121 */
+	[0x60] = KEY_F5,		      /*  63 */
+	[0x61] = KEY_F6,		      /*  64 */
+	[0x62] = KEY_F7,		      /*  65 */
+	[0x63] = KEY_F3,		      /*  61 */
+	[0x64] = KEY_F8,		      /*  66 */
+	[0x65] = KEY_F9,		      /*  67 */
+	[0x66] = KEY_HANJA,		   /* 123 */
+	[0x67] = KEY_F11,		      /*  87 */
+	[0x68] = KEY_HANGEUL,		/* 122 */
+	[0x69] = KEY_SYSRQ,		   /*  99 */
+	[0x6a] = 0,
+	[0x6b] = KEY_SCROLLLOCK,	/*  70 */
+	[0x6c] = 0,
+	[0x6d] = KEY_F10,		      /*  68 */
+	[0x6e] = KEY_COMPOSE,		/* 127 */
+	[0x6f] = KEY_F12,		      /*  88 */
+	[0x70] = 0,
+	[0x71] = KEY_PAUSE,		   /* 119 */
+	[0x72] = KEY_INSERT,		   /* 110 */
+	[0x73] = KEY_HOME,		   /* 102 */
+	[0x74] = KEY_PAGEUP,		   /* 104 */
+	[0x75] = KEY_DELETE,		   /* 111 */
+	[0x76] = KEY_F4,		      /*  62 */
+	[0x77] = KEY_END,		      /* 107 */
+	[0x78] = KEY_F2,		      /*  60 */
+	[0x79] = KEY_PAGEDOWN,	   /* 109 */
+	[0x7a] = KEY_F1,		      /*  59 */
+	[0x7b] = KEY_RIGHTSHIFT,	/*  54 */
+	[0x7c] = KEY_RIGHTALT,	   /* 100 */
+	[0x7d] = KEY_RIGHTCTRL,	   /*  97 */
+	[0x7e] = KEY_RIGHTMETA,	   /* 126 */
+	[0x7f] = KEY_POWER,		   /* 116 */
 };
 
 struct adbhid {
-- 
2.35.1

[PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
 drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..f188e07f518b 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
+[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
+[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
+[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
+[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
+[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
+[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
+[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
+[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
+[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
+[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
+[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
+[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
+[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
+[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
+[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
+[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
+[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
+[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
+[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
+[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
+[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
+[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
+[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
+[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
 
 /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
+[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
+[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
+[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
 
-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
+[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
 
-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
 
 /*
  * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
@@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
  */
 
 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
 
 			{ }		/* Terminating entry */
diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..48760470e821 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
+	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
+	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
+	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
+	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
+	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
+	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
+	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
+	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
+	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
+	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
+	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
+	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
+	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
+	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
+			   { }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
 
-- 
2.35.1

[PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
 drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..f188e07f518b 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
+[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
+[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
+[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
+[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
+[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
+[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
+[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
+[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
+[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
+[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
+[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
+[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
+[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
+[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
+[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
+[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
+[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
+[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
+[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
+[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
+[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
+[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
+[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
+[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
 
 /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
+[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
+[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
+[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
 
-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
+[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
 
-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
 
 /*
  * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
@@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
  */
 
 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
 
 			{ }		/* Terminating entry */
diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..48760470e821 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
+	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
+	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
+	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
+	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
+	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
+	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
+	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
+	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
+	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
+	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
+	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
+	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
+	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
+	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
+			   { }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
 
-- 
2.35.1

[PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
 drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..f188e07f518b 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
+[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
+[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
+[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
+[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
+[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
+[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
+[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
+[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
+[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
+[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
+[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
+[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
+[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
+[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
+[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
+[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
+[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
+[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
+[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
+[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
+[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
+[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
+[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
+[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
 
 /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
+[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
+[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
+[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
 
-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
+[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
 
-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
 
 /*
  * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
@@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
  */
 
 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
 
 			{ }		/* Terminating entry */
diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..48760470e821 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
 
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
+	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
+	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
+	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
+	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
+	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
+	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
+	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
+	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
+	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
+	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
+	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
+	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
+	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
+	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
+			   { }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
 
-- 
2.35.1

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:59:03 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>  2 files changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> index e9dc27f73970..f188e07f518b 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mb_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },

While here, please properly indent this table, and respect the 80-columns limit,
e. g.:

static struct usb_device_id dibusb_dib3000mb_table [] = {
	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
	},
	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
	},
	...

	
Regards,
Mauro

> +[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> +[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> +[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> +[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> +[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> +[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> +[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> +[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> +[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> +[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> +[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> +[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> +[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> +[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> +[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> +[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> +[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>  
>  /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
> -/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> -/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> -/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
> +[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> +[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> +[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
>  
> -/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
>  
> -/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
> +[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
>  
>  /*
>   * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
> @@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
>   */
>  
>  #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
> -/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
> +[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
>  #endif
>  
>  			{ }		/* Terminating entry */
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
> index e2689977c8c8..48760470e821 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mc.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
> @@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mc_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> -/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> -/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> -/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> -/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> -/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> -/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> -/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> -/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> -			{ }		/* Terminating entry */
> +	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> +	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> +	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> +	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> +	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> +	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> +	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> +	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> +	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> +	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> +	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> +	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> +	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> +	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> +	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> +			   { }		/* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
>  



Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:59:03 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>  2 files changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> index e9dc27f73970..f188e07f518b 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mb_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },

While here, please properly indent this table, and respect the 80-columns limit,
e. g.:

static struct usb_device_id dibusb_dib3000mb_table [] = {
	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
	},
	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
	},
	...

	
Regards,
Mauro

> +[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> +[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> +[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> +[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> +[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> +[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> +[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> +[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> +[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> +[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> +[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> +[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> +[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> +[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> +[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> +[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> +[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>  
>  /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
> -/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> -/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> -/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
> +[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> +[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> +[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
>  
> -/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
>  
> -/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
> +[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
>  
>  /*
>   * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
> @@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
>   */
>  
>  #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
> -/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
> +[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
>  #endif
>  
>  			{ }		/* Terminating entry */
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
> index e2689977c8c8..48760470e821 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mc.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
> @@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mc_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> -/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> -/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> -/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> -/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> -/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> -/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> -/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> -/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> -			{ }		/* Terminating entry */
> +	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> +	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> +	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> +	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> +	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> +	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> +	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> +	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> +	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> +	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> +	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> +	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> +	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> +	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> +	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> +			   { }		/* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
>  



Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:59:03 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>  2 files changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> index e9dc27f73970..f188e07f518b 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mb_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },

While here, please properly indent this table, and respect the 80-columns limit,
e. g.:

static struct usb_device_id dibusb_dib3000mb_table [] = {
	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
	},
	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
	},
	...

	
Regards,
Mauro

> +[2]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> +[3]  =	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> +[4]  =	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> +[5]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[6]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[8]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> +[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> +[10] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> +[11] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> +[12] =	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> +[13] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> +[14] =	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> +[15] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> +[16] =	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> +[17] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> +[18] =	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> +[19] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> +[20] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> +[21] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> +[22] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> +[23] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>  
>  /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */
> -/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> -/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> -/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
> +[24] =	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> +[25] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> +[26] =	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
>  
> -/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
> +[27] =	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
>  
> -/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
> +[28] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +[29] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) },
>  
>  /*
>   * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1 devices
> @@ -166,7 +166,7 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
>   */
>  
>  #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
> -/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
> +[30] =	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
>  #endif
>  
>  			{ }		/* Terminating entry */
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
> index e2689977c8c8..48760470e821 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mc.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
> @@ -25,23 +25,23 @@ static int dibusb_mc_probe(struct usb_interface *intf,
>  
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mc_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> -/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> -/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> -/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> -/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> -/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> -/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> -/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> -/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> -			{ }		/* Terminating entry */
> +	[0]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> +	[1]  =	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> +	[2]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> +	[3]  =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> +	[4]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> +	[5]  =	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> +	[6]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> +	[7]  =	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> +	[8]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> +	[9]  =	{ USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> +	[10] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> +	[11] =	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> +	[12] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> +	[13] =	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> +	[14] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> +	[15] =	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> +			   { }		/* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
>  



Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 19:24:54 +0100
Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:

> Em Sat, 26 Mar 2022 17:59:03 +0100
> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> 
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> > 
> > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > ---
> >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >  2 files changed, 48 insertions(+), 48 deletions(-)
> > 
> > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > index e9dc27f73970..f188e07f518b 100644
> > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >  
> >  /* do not change the order of the ID table */
> >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> 
> While here, please properly indent this table, and respect the 80-columns limit,
> e. g.:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> 	},
> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> 	},
> 	...

Err.... something went wrong with my space bar and I ended hitting send to
soon... I meant:

static struct usb_device_id dibusb_dib3000mb_table [] = {
 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
 	},
 	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
 			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
 	},
	...
};

Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 19:24:54 +0100
Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:

> Em Sat, 26 Mar 2022 17:59:03 +0100
> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> 
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> > 
> > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > ---
> >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >  2 files changed, 48 insertions(+), 48 deletions(-)
> > 
> > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > index e9dc27f73970..f188e07f518b 100644
> > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >  
> >  /* do not change the order of the ID table */
> >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> 
> While here, please properly indent this table, and respect the 80-columns limit,
> e. g.:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> 	},
> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> 	},
> 	...

Err.... something went wrong with my space bar and I ended hitting send to
soon... I meant:

static struct usb_device_id dibusb_dib3000mb_table [] = {
 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
 	},
 	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
 			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
 	},
	...
};

Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 19:24:54 +0100
Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:

> Em Sat, 26 Mar 2022 17:59:03 +0100
> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> 
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> > 
> > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > ---
> >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >  2 files changed, 48 insertions(+), 48 deletions(-)
> > 
> > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > index e9dc27f73970..f188e07f518b 100644
> > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >  
> >  /* do not change the order of the ID table */
> >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> 
> While here, please properly indent this table, and respect the 80-columns limit,
> e. g.:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> 	},
> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> 	},
> 	...

Err.... something went wrong with my space bar and I ended hitting send to
soon... I meant:

static struct usb_device_id dibusb_dib3000mb_table [] = {
 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
 	},
 	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
 			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
 	},
	...
};

Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
> Em Sat, 26 Mar 2022 19:24:54 +0100
> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> 
> > Em Sat, 26 Mar 2022 17:59:03 +0100
> > Benjamin Stürz <benni@stuerz.xyz> escreveu:
> > 
> > > This replaces comments with C99's designated
> > > initializers because the kernel supports them now.
> > > 
> > > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > > ---
> > >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> > >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> > >  2 files changed, 48 insertions(+), 48 deletions(-)
> > > 
> > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > index e9dc27f73970..f188e07f518b 100644
> > > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> > >  
> > >  /* do not change the order of the ID table */
> > >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> > 
> > While here, please properly indent this table, and respect the 80-columns limit,
> > e. g.:
> > 
> > static struct usb_device_id dibusb_dib3000mb_table [] = {
> > 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> > 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> > 	},
> > 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> > 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> > 	},
> > 	...
> 
> Err.... something went wrong with my space bar and I ended hitting send to
> soon... I meant:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
>  	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
>  			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
>  	},
>  	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>  			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>  	},
> 	...
> };

maybe static const too

and

maybe

#define DIB_DEVICE(vid, pid)	\
	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }

so maybe

static const struct usb_device_id dibusb_dib3000mb_table[] = {
	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
	...
};

though I _really_ doubt the value of the specific indexing.

I think this isn't really worth changing at all.

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
> Em Sat, 26 Mar 2022 19:24:54 +0100
> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> 
> > Em Sat, 26 Mar 2022 17:59:03 +0100
> > Benjamin Stürz <benni@stuerz.xyz> escreveu:
> > 
> > > This replaces comments with C99's designated
> > > initializers because the kernel supports them now.
> > > 
> > > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > > ---
> > >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> > >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> > >  2 files changed, 48 insertions(+), 48 deletions(-)
> > > 
> > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > index e9dc27f73970..f188e07f518b 100644
> > > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> > >  
> > >  /* do not change the order of the ID table */
> > >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> > 
> > While here, please properly indent this table, and respect the 80-columns limit,
> > e. g.:
> > 
> > static struct usb_device_id dibusb_dib3000mb_table [] = {
> > 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> > 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> > 	},
> > 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> > 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> > 	},
> > 	...
> 
> Err.... something went wrong with my space bar and I ended hitting send to
> soon... I meant:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
>  	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
>  			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
>  	},
>  	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>  			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>  	},
> 	...
> };

maybe static const too

and

maybe

#define DIB_DEVICE(vid, pid)	\
	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }

so maybe

static const struct usb_device_id dibusb_dib3000mb_table[] = {
	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
	...
};

though I _really_ doubt the value of the specific indexing.

I think this isn't really worth changing at all.

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Joe Perches]

On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
> Em Sat, 26 Mar 2022 19:24:54 +0100
> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> 
> > Em Sat, 26 Mar 2022 17:59:03 +0100
> > Benjamin Stürz <benni@stuerz.xyz> escreveu:
> > 
> > > This replaces comments with C99's designated
> > > initializers because the kernel supports them now.
> > > 
> > > Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> > > ---
> > >  drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> > >  drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> > >  2 files changed, 48 insertions(+), 48 deletions(-)
> > > 
> > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > index e9dc27f73970..f188e07f518b 100644
> > > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> > > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> > >  
> > >  /* do not change the order of the ID table */
> > >  static struct usb_device_id dibusb_dib3000mb_table [] = {
> > > -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> > > -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> > > -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> > > -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> > > -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> > > -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> > > -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> > > -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> > > -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> > > -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> > > -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> > > -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> > > -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> > > -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> > > -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> > > -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> > > -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> > > -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> > > -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> > > +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> > > +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> > 
> > While here, please properly indent this table, and respect the 80-columns limit,
> > e. g.:
> > 
> > static struct usb_device_id dibusb_dib3000mb_table [] = {
> > 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
> > 			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
> > 	},
> > 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> > 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> > 	},
> > 	...
> 
> Err.... something went wrong with my space bar and I ended hitting send to
> soon... I meant:
> 
> static struct usb_device_id dibusb_dib3000mb_table [] = {
>  	[0] = { USB_DEVICE(USB_VID_WIDEVIEW 
>  			   USB_PID_AVERMEDIA_DVBT_USB_COLD) 
>  	},
>  	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>  			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>  	},
> 	...
> };

maybe static const too

and

maybe

#define DIB_DEVICE(vid, pid)	\
	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }

so maybe

static const struct usb_device_id dibusb_dib3000mb_table[] = {
	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
	...
};

though I _really_ doubt the value of the specific indexing.

I think this isn't really worth changing at all.

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 14:51, Joe Perches wrote:
> On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
>> Em Sat, 26 Mar 2022 19:24:54 +0100
>> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
>>
>>> Em Sat, 26 Mar 2022 17:59:03 +0100
>>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
>>>
>>>> This replaces comments with C99's designated
>>>> initializers because the kernel supports them now.
>>>>
>>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>>>> ---
>>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>>>>   2 files changed, 48 insertions(+), 48 deletions(-)
>>>>
>>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> index e9dc27f73970..f188e07f518b 100644
>>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>>>>   
>>>>   /* do not change the order of the ID table */
>>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
>>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
>>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
>>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
>>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
>>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
>>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
>>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
>>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
>>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
>>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
>>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
>>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
>>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
>>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>
>>> While here, please properly indent this table, and respect the 80-columns limit,
>>> e. g.:
>>>
>>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>> 	},
>>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
>>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>> 	},
>>> 	...
>>
>> Err.... something went wrong with my space bar and I ended hitting send to
>> soon... I meant:
>>
>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>   	},
>>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>   	},
>> 	...
>> };
> 
> maybe static const too
> 
> and
> 
> maybe
> 
> #define DIB_DEVICE(vid, pid)	\
> 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> 
> so maybe
> 
> static const struct usb_device_id dibusb_dib3000mb_table[] = {
> 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> 	...
> };
> 
> though I _really_ doubt the value of the specific indexing.
> 
> I think this isn't really worth changing at all.

I agree. For the drivers that I maintain, I try to keep the vendor and device 
ids in numerical order. As this table does not require a special order, adding a 
new one in the middle would require redoing all of then after that point. That 
would be pointless work!

Larry

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 14:51, Joe Perches wrote:
> On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
>> Em Sat, 26 Mar 2022 19:24:54 +0100
>> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
>>
>>> Em Sat, 26 Mar 2022 17:59:03 +0100
>>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
>>>
>>>> This replaces comments with C99's designated
>>>> initializers because the kernel supports them now.
>>>>
>>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>>>> ---
>>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>>>>   2 files changed, 48 insertions(+), 48 deletions(-)
>>>>
>>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> index e9dc27f73970..f188e07f518b 100644
>>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>>>>   
>>>>   /* do not change the order of the ID table */
>>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
>>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
>>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
>>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
>>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
>>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
>>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
>>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
>>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
>>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
>>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
>>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
>>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
>>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
>>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>
>>> While here, please properly indent this table, and respect the 80-columns limit,
>>> e. g.:
>>>
>>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>> 	},
>>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
>>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>> 	},
>>> 	...
>>
>> Err.... something went wrong with my space bar and I ended hitting send to
>> soon... I meant:
>>
>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>   	},
>>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>   	},
>> 	...
>> };
> 
> maybe static const too
> 
> and
> 
> maybe
> 
> #define DIB_DEVICE(vid, pid)	\
> 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> 
> so maybe
> 
> static const struct usb_device_id dibusb_dib3000mb_table[] = {
> 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> 	...
> };
> 
> though I _really_ doubt the value of the specific indexing.
> 
> I think this isn't really worth changing at all.

I agree. For the drivers that I maintain, I try to keep the vendor and device 
ids in numerical order. As this table does not require a special order, adding a 
new one in the middle would require redoing all of then after that point. That 
would be pointless work!

Larry

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 14:51, Joe Perches wrote:
> On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:
>> Em Sat, 26 Mar 2022 19:24:54 +0100
>> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
>>
>>> Em Sat, 26 Mar 2022 17:59:03 +0100
>>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
>>>
>>>> This replaces comments with C99's designated
>>>> initializers because the kernel supports them now.
>>>>
>>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>>>> ---
>>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
>>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
>>>>   2 files changed, 48 insertions(+), 48 deletions(-)
>>>>
>>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> index e9dc27f73970..f188e07f518b 100644
>>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
>>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
>>>>   
>>>>   /* do not change the order of the ID table */
>>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
>>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
>>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
>>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
>>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
>>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
>>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
>>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
>>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
>>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
>>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
>>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
>>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
>>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
>>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
>>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
>>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
>>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
>>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
>>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
>>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
>>>
>>> While here, please properly indent this table, and respect the 80-columns limit,
>>> e. g.:
>>>
>>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>> 	},
>>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
>>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>> 	},
>>> 	...
>>
>> Err.... something went wrong with my space bar and I ended hitting send to
>> soon... I meant:
>>
>> static struct usb_device_id dibusb_dib3000mb_table [] = {
>>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
>>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
>>   	},
>>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
>>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
>>   	},
>> 	...
>> };
> 
> maybe static const too
> 
> and
> 
> maybe
> 
> #define DIB_DEVICE(vid, pid)	\
> 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> 
> so maybe
> 
> static const struct usb_device_id dibusb_dib3000mb_table[] = {
> 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> 	...
> };
> 
> though I _really_ doubt the value of the specific indexing.
> 
> I think this isn't really worth changing at all.

I agree. For the drivers that I maintain, I try to keep the vendor and device 
ids in numerical order. As this table does not require a special order, adding a 
new one in the middle would require redoing all of then after that point. That 
would be pointless work!

Larry

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 15:11:46 -0500
Larry Finger <Larry.Finger@lwfinger.net> escreveu:

> On 3/26/22 14:51, Joe Perches wrote:
> > On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:  
> >> Em Sat, 26 Mar 2022 19:24:54 +0100
> >> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> >>  
> >>> Em Sat, 26 Mar 2022 17:59:03 +0100
> >>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> >>>  
> >>>> This replaces comments with C99's designated
> >>>> initializers because the kernel supports them now.
> >>>>
> >>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >>>> ---
> >>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >>>>   2 files changed, 48 insertions(+), 48 deletions(-)
> >>>>
> >>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> index e9dc27f73970..f188e07f518b 100644
> >>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >>>>   
> >>>>   /* do not change the order of the ID table */
> >>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> >>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> >>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> >>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> >>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> >>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> >>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> >>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> >>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> >>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> >>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> >>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> >>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> >>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> >>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> >>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> >>>
> >>> While here, please properly indent this table, and respect the 80-columns limit,
> >>> e. g.:
> >>>
> >>> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>> 	},
> >>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> >>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>> 	},
> >>> 	...  
> >>
> >> Err.... something went wrong with my space bar and I ended hitting send to
> >> soon... I meant:
> >>
> >> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>   	},
> >>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>   	},
> >> 	...
> >> };  
> > 
> > maybe static const too
> > 
> > and
> > 
> > maybe
> > 
> > #define DIB_DEVICE(vid, pid)	\
> > 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> > 
> > so maybe
> > 
> > static const struct usb_device_id dibusb_dib3000mb_table[] = {
> > 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> > 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> > 	...
> > };
> > 
> > though I _really_ doubt the value of the specific indexing.
> > 
> > I think this isn't really worth changing at all.  
> 
> I agree. For the drivers that I maintain, I try to keep the vendor and device 
> ids in numerical order. As this table does not require a special order, adding a 
> new one in the middle would require redoing all of then after that point. That 
> would be pointless work!

Unfortunately, that's not the case for drivers that use the legacy dvb-usb
core, as it has other tables that reference the device IDs from this table
by number.

The best here would be to do something like:

enum {
	AVERMEDIA_DVBT_USB_COLD,
	AVERMEDIA_DVBT_USB_WARM,
	COMPRO_DVBU2000_COLD,
	COMPRO_DVBU2000_WARM,
	COMPRO_DVBU2000_UNK_COLD,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	KWORLD_VSTREAM_COLD,
	KWORLD_VSTREAM_WARM,
	GRANDTEC_DVBT_USB_COLD,
	GRANDTEC_DVBT_USB_WARM,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	UNK_HYPER_PALTEK_COLD,
	UNK_HYPER_PALTEK_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	ULTIMA_TVBOX_COLD,
	ULTIMA_TVBOX_WARM,
	ULTIMA_TVBOX_AN2235_COLD,
	ULTIMA_TVBOX_AN2235_WARM,
	ADSTECH_USB2_COLD,
	ADSTECH_USB2_WARM,
	KYE_DVB_T_COLD,
	KYE_DVB_T_WARM,
	KWORLD_VSTREAM_COLD,
	ULTIMA_TVBOX_USB2_COLD,
	ULTIMA_TVBOX_USB2_WARM,
	ULTIMA_TVBOX_ANCHOR_COLD,
};

Then define the table as:

static const struct usb_device_id dibusb_dib3000mb_table[] 
{
  	[AVERMEDIA_DVBT_USB_COLD] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_COLD)
  	},
  	[AVERMEDIA_DVBT_USB_WARM] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_WARM)
  	},
	...
}

(eventually, using some macro to help defining them)

Finally, change the other static tables to also use the same name,
e. g.:

static const struct dvb_usb_device_properties dibusb1_1_properties = {
	...
	.num_device_descs = 9,
	.devices = {
		{	"AVerMedia AverTV DVBT USB1.1",
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_COLD],  NULL },
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_WARM],  NULL },
		},

	...
};

The same applies to other drivers inside drivers/media/usb/dvb-usb/.

Alternatively, the drivers there should be ported to the newer DVB USB
core (dvb-usb-v2).

Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 15:11:46 -0500
Larry Finger <Larry.Finger@lwfinger.net> escreveu:

> On 3/26/22 14:51, Joe Perches wrote:
> > On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:  
> >> Em Sat, 26 Mar 2022 19:24:54 +0100
> >> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> >>  
> >>> Em Sat, 26 Mar 2022 17:59:03 +0100
> >>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> >>>  
> >>>> This replaces comments with C99's designated
> >>>> initializers because the kernel supports them now.
> >>>>
> >>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >>>> ---
> >>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >>>>   2 files changed, 48 insertions(+), 48 deletions(-)
> >>>>
> >>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> index e9dc27f73970..f188e07f518b 100644
> >>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >>>>   
> >>>>   /* do not change the order of the ID table */
> >>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> >>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> >>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> >>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> >>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> >>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> >>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> >>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> >>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> >>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> >>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> >>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> >>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> >>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> >>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> >>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> >>>
> >>> While here, please properly indent this table, and respect the 80-columns limit,
> >>> e. g.:
> >>>
> >>> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>> 	},
> >>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> >>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>> 	},
> >>> 	...  
> >>
> >> Err.... something went wrong with my space bar and I ended hitting send to
> >> soon... I meant:
> >>
> >> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>   	},
> >>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>   	},
> >> 	...
> >> };  
> > 
> > maybe static const too
> > 
> > and
> > 
> > maybe
> > 
> > #define DIB_DEVICE(vid, pid)	\
> > 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> > 
> > so maybe
> > 
> > static const struct usb_device_id dibusb_dib3000mb_table[] = {
> > 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> > 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> > 	...
> > };
> > 
> > though I _really_ doubt the value of the specific indexing.
> > 
> > I think this isn't really worth changing at all.  
> 
> I agree. For the drivers that I maintain, I try to keep the vendor and device 
> ids in numerical order. As this table does not require a special order, adding a 
> new one in the middle would require redoing all of then after that point. That 
> would be pointless work!

Unfortunately, that's not the case for drivers that use the legacy dvb-usb
core, as it has other tables that reference the device IDs from this table
by number.

The best here would be to do something like:

enum {
	AVERMEDIA_DVBT_USB_COLD,
	AVERMEDIA_DVBT_USB_WARM,
	COMPRO_DVBU2000_COLD,
	COMPRO_DVBU2000_WARM,
	COMPRO_DVBU2000_UNK_COLD,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	KWORLD_VSTREAM_COLD,
	KWORLD_VSTREAM_WARM,
	GRANDTEC_DVBT_USB_COLD,
	GRANDTEC_DVBT_USB_WARM,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	UNK_HYPER_PALTEK_COLD,
	UNK_HYPER_PALTEK_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	ULTIMA_TVBOX_COLD,
	ULTIMA_TVBOX_WARM,
	ULTIMA_TVBOX_AN2235_COLD,
	ULTIMA_TVBOX_AN2235_WARM,
	ADSTECH_USB2_COLD,
	ADSTECH_USB2_WARM,
	KYE_DVB_T_COLD,
	KYE_DVB_T_WARM,
	KWORLD_VSTREAM_COLD,
	ULTIMA_TVBOX_USB2_COLD,
	ULTIMA_TVBOX_USB2_WARM,
	ULTIMA_TVBOX_ANCHOR_COLD,
};

Then define the table as:

static const struct usb_device_id dibusb_dib3000mb_table[] 
{
  	[AVERMEDIA_DVBT_USB_COLD] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_COLD)
  	},
  	[AVERMEDIA_DVBT_USB_WARM] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_WARM)
  	},
	...
}

(eventually, using some macro to help defining them)

Finally, change the other static tables to also use the same name,
e. g.:

static const struct dvb_usb_device_properties dibusb1_1_properties = {
	...
	.num_device_descs = 9,
	.devices = {
		{	"AVerMedia AverTV DVBT USB1.1",
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_COLD],  NULL },
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_WARM],  NULL },
		},

	...
};

The same applies to other drivers inside drivers/media/usb/dvb-usb/.

Alternatively, the drivers there should be ported to the newer DVB USB
core (dvb-usb-v2).

Thanks,
Mauro

Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 15:11:46 -0500
Larry Finger <Larry.Finger@lwfinger.net> escreveu:

> On 3/26/22 14:51, Joe Perches wrote:
> > On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote:  
> >> Em Sat, 26 Mar 2022 19:24:54 +0100
> >> Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> >>  
> >>> Em Sat, 26 Mar 2022 17:59:03 +0100
> >>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> >>>  
> >>>> This replaces comments with C99's designated
> >>>> initializers because the kernel supports them now.
> >>>>
> >>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >>>> ---
> >>>>   drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +++++++++++++--------------
> >>>>   drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++++++--------
> >>>>   2 files changed, 48 insertions(+), 48 deletions(-)
> >>>>
> >>>> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> index e9dc27f73970..f188e07f518b 100644
> >>>> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> >>>> @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf,
> >>>>   
> >>>>   /* do not change the order of the ID table */
> >>>>   static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>>> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> >>>> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> >>>> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> >>>> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,	USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> >>>> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> >>>> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> >>>> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> >>>> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> >>>> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> >>>> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> >>>> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD) },
> >>>> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM) },
> >>>> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> >>>> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> >>>> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_COLD) },
> >>>> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_WARM) },
> >>>> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> >>>> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> >>>> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> >>>> +[0]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> >>>> +[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,		USB_PID_AVERMEDIA_DVBT_USB_WARM) },  
> >>>
> >>> While here, please properly indent this table, and respect the 80-columns limit,
> >>> e. g.:
> >>>
> >>> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>> 	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>> 			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>> 	},
> >>> 	[1]  =	{ USB_DEVICE(USB_VID_WIDEVIEW,
> >>> 			     USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>> 	},
> >>> 	...  
> >>
> >> Err.... something went wrong with my space bar and I ended hitting send to
> >> soon... I meant:
> >>
> >> static struct usb_device_id dibusb_dib3000mb_table [] = {
> >>   	[0] = { USB_DEVICE(USB_VID_WIDEVIEW
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_COLD)
> >>   	},
> >>   	[1] = { USB_DEVICE(USB_VID_WIDEVIEW,
> >>   			   USB_PID_AVERMEDIA_DVBT_USB_WARM)
> >>   	},
> >> 	...
> >> };  
> > 
> > maybe static const too
> > 
> > and
> > 
> > maybe
> > 
> > #define DIB_DEVICE(vid, pid)	\
> > 	{ USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) }
> > 
> > so maybe
> > 
> > static const struct usb_device_id dibusb_dib3000mb_table[] = {
> > 	[0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD),
> > 	[1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM),
> > 	...
> > };
> > 
> > though I _really_ doubt the value of the specific indexing.
> > 
> > I think this isn't really worth changing at all.  
> 
> I agree. For the drivers that I maintain, I try to keep the vendor and device 
> ids in numerical order. As this table does not require a special order, adding a 
> new one in the middle would require redoing all of then after that point. That 
> would be pointless work!

Unfortunately, that's not the case for drivers that use the legacy dvb-usb
core, as it has other tables that reference the device IDs from this table
by number.

The best here would be to do something like:

enum {
	AVERMEDIA_DVBT_USB_COLD,
	AVERMEDIA_DVBT_USB_WARM,
	COMPRO_DVBU2000_COLD,
	COMPRO_DVBU2000_WARM,
	COMPRO_DVBU2000_UNK_COLD,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	KWORLD_VSTREAM_COLD,
	KWORLD_VSTREAM_WARM,
	GRANDTEC_DVBT_USB_COLD,
	GRANDTEC_DVBT_USB_WARM,
	DIBCOM_MOD3000_COLD,
	DIBCOM_MOD3000_WARM,
	UNK_HYPER_PALTEK_COLD,
	UNK_HYPER_PALTEK_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	TWINHAN_VP7041_COLD,
	TWINHAN_VP7041_WARM,
	ULTIMA_TVBOX_COLD,
	ULTIMA_TVBOX_WARM,
	ULTIMA_TVBOX_AN2235_COLD,
	ULTIMA_TVBOX_AN2235_WARM,
	ADSTECH_USB2_COLD,
	ADSTECH_USB2_WARM,
	KYE_DVB_T_COLD,
	KYE_DVB_T_WARM,
	KWORLD_VSTREAM_COLD,
	ULTIMA_TVBOX_USB2_COLD,
	ULTIMA_TVBOX_USB2_WARM,
	ULTIMA_TVBOX_ANCHOR_COLD,
};

Then define the table as:

static const struct usb_device_id dibusb_dib3000mb_table[] 
{
  	[AVERMEDIA_DVBT_USB_COLD] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_COLD)
  	},
  	[AVERMEDIA_DVBT_USB_WARM] = { USB_DEVICE(USB_VID_WIDEVIEW,
				      USB_PID_AVERMEDIA_DVBT_USB_WARM)
  	},
	...
}

(eventually, using some macro to help defining them)

Finally, change the other static tables to also use the same name,
e. g.:

static const struct dvb_usb_device_properties dibusb1_1_properties = {
	...
	.num_device_descs = 9,
	.devices = {
		{	"AVerMedia AverTV DVBT USB1.1",
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_COLD],  NULL },
			{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_WARM],  NULL },
		},

	...
};

The same applies to other drivers inside drivers/media/usb/dvb-usb/.

Alternatively, the drivers there should be ported to the newer DVB USB
core (dvb-usb-v2).

Thanks,
Mauro

[PATCH 16/22 v3] dvb-usb: Replace comments with C99 initializers

[Benjamin Stürz]

Replace comments telling the index with explicit designators and make
the array entries more compact to aid in better readability.

It was suggested to make the arrays const, but that didn't compile.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 69 ++++++++++++++-------------
 drivers/media/usb/dvb-usb/dibusb-mc.c | 39 ++++++++-------
 2 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c
b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..ec1fb30c5665 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -120,42 +120,45 @@ static int dibusb_probe(struct usb_interface *intf,
 	return -EINVAL;
 }

+#define DIB_DEVICE(vid, pid)	\
+	{ USB_DEVICE(USB_VID_##vid, USB_PID_##pid) }
+
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,
USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
+	[0]  = DIB_DEVICE(WIDEVIEW,		AVERMEDIA_DVBT_USB_COLD),
+	[1]  = DIB_DEVICE(WIDEVIEW,		AVERMEDIA_DVBT_USB_WARM),
+	[2]  = DIB_DEVICE(COMPRO,		COMPRO_DVBU2000_COLD),
+	[3]  = DIB_DEVICE(COMPRO,		COMPRO_DVBU2000_WARM),
+	[4]  = DIB_DEVICE(COMPRO_UNK,		COMPRO_DVBU2000_UNK_COLD),
+	[5]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3000_COLD),
+	[6]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3000_WARM),
+	[7]  = DIB_DEVICE(EMPIA,		KWORLD_VSTREAM_COLD),
+	[8]  = DIB_DEVICE(EMPIA,		KWORLD_VSTREAM_WARM),
+	[9]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB_COLD),
+	[10] = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB_WARM),
+	[11] = DIB_DEVICE(GRANDTEC,		DIBCOM_MOD3000_COLD),
+	[12] = DIB_DEVICE(GRANDTEC,		DIBCOM_MOD3000_WARM),
+	[13] = DIB_DEVICE(HYPER_PALTEK,		UNK_HYPER_PALTEK_COLD),
+	[14] = DIB_DEVICE(HYPER_PALTEK,		UNK_HYPER_PALTEK_WARM),
+	[15] = DIB_DEVICE(VISIONPLUS,		TWINHAN_VP7041_COLD),
+	[16] = DIB_DEVICE(VISIONPLUS,		TWINHAN_VP7041_WARM),
+	[17] = DIB_DEVICE(TWINHAN,		TWINHAN_VP7041_COLD),
+	[18] = DIB_DEVICE(TWINHAN,		TWINHAN_VP7041_WARM),
+	[19] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_COLD),
+	[20] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_WARM),
+	[21] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_AN2235_COLD),
+	[22] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_AN2235_WARM),
+	[23] = DIB_DEVICE(ADSTECH,		ADSTECH_USB2_COLD),

 /* device ID with default DIBUSB2_0-firmware and with the hacked
firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
+	[24] = DIB_DEVICE(ADSTECH,		ADSTECH_USB2_WARM),
+	[25] = DIB_DEVICE(KYE,			KYE_DVB_T_COLD),
+	[26] = DIB_DEVICE(KYE,			KYE_DVB_T_WARM),

-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
+	[27] = DIB_DEVICE(KWORLD,		KWORLD_VSTREAM_COLD),

-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) },
+	[28] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_COLD),
+	[29] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_WARM),

 /*
  * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
devices
@@ -166,13 +169,15 @@ static struct usb_device_id dibusb_dib3000mb_table
[] = {
  */

 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+	[30] = DIB_DEVICE(ANCHOR,		ULTIMA_TVBOX_ANCHOR_COLD),
 #endif

-			{ }		/* Terminating entry */
+	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);

+#undef DIB_DEVICE
+
 static struct dvb_usb_device_properties dibusb1_1_properties = {
 	.caps =  DVB_USB_IS_AN_I2C_ADAPTER,

diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c
b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..703c2a7df369 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -23,28 +23,33 @@ static int dibusb_mc_probe(struct usb_interface *intf,
 				   NULL, adapter_nr);
 }

+#define DIB_DEVICE(vid, pid)	\
+	{ USB_DEVICE(USB_VID_##vid, USB_PID_##pid) }
+
 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3001_COLD),
+	[1]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3001_WARM),
+	[2]  = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_COLD),
+	[3]  = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_WARM), // ( ? )
+	[4]  = DIB_DEVICE(LITEON,		LITEON_DVB_T_COLD),
+	[5]  = DIB_DEVICE(LITEON,		LITEON_DVB_T_WARM),
+	[6]  = DIB_DEVICE(EMPIA,		DIGIVOX_MINI_SL_COLD),
+	[7]  = DIB_DEVICE(EMPIA,		DIGIVOX_MINI_SL_WARM),
+	[8]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB2_COLD),
+	[9]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB2_WARM),
+	[10] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ARTEC_T14_COLD),
+	[11] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ARTEC_T14_WARM),
+	[12] = DIB_DEVICE(LEADTEK,		WINFAST_DTV_DONGLE_COLD),
+	[13] = DIB_DEVICE(LEADTEK,		WINFAST_DTV_DONGLE_WARM),
+	[14] = DIB_DEVICE(HUMAX_COEX,		DVB_T_USB_STICK_HIGH_SPEED_COLD),
+	[15] = DIB_DEVICE(HUMAX_COEX,		DVB_T_USB_STICK_HIGH_SPEED_WARM),
+	{ }					/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);

+#undef DIB_DEVICE
+
 static struct dvb_usb_device_properties dibusb_mc_properties = {
 	.caps = DVB_USB_IS_AN_I2C_ADAPTER,

-- 
2.35.1

Re: [PATCH 16/22 v3] dvb-usb: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Mon, 28 Mar 2022 20:08:30 +0200
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> Replace comments telling the index with explicit designators and make
> the array entries more compact to aid in better readability.

Just using designated initializers is not enough for dvb-usb, as the
big issue there is really the fact that the dvb-usb struct needs to point
to the entries inside the USB ID table.

Also, your patch touches only two of the several dvb-usb drivers. So,
I ended taking some time and writing a series:

	https://lore.kernel.org/linux-media/cover.1648499509.git.mchehab@kernel.org/T/#t

Giving you credits for suggesting it at the dibusb-* patches.

> It was suggested to make the arrays const, but that didn't compile.

Yeah, the struct that points to it is not marked as const, as there
are a couple of drivers that actually change some things there.

As I said, the real fix would be to just migrate the drivers from
the legacy dvb-usb core to the newer dvb-usb-v2.

But, at least with the newer series, the risk of pointing to the
wrong entry is reduced.

Regards,
Mauro

> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/media/usb/dvb-usb/dibusb-mb.c | 69 ++++++++++++++-------------
>  drivers/media/usb/dvb-usb/dibusb-mc.c | 39 ++++++++-------
>  2 files changed, 59 insertions(+), 49 deletions(-)
> 
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c
> b/drivers/media/usb/dvb-usb/dibusb-mb.c
> index e9dc27f73970..ec1fb30c5665 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mb.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
> @@ -120,42 +120,45 @@ static int dibusb_probe(struct usb_interface *intf,
>  	return -EINVAL;
>  }
> 
> +#define DIB_DEVICE(vid, pid)	\
> +	{ USB_DEVICE(USB_VID_##vid, USB_PID_##pid) }
> +
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mb_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
> USB_PID_AVERMEDIA_DVBT_USB_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
> USB_PID_AVERMEDIA_DVBT_USB_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
> -/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,
> USB_PID_COMPRO_DVBU2000_UNK_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
> -/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
> -/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
> -/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
> -/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
> -/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
> USB_PID_UNK_HYPER_PALTEK_COLD) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
> USB_PID_UNK_HYPER_PALTEK_WARM) },
> -/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
> -/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
> -/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
> -/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
> -/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_COLD) },
> -/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_WARM) },
> -/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
> -/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
> -/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
> +	[0]  = DIB_DEVICE(WIDEVIEW,		AVERMEDIA_DVBT_USB_COLD),
> +	[1]  = DIB_DEVICE(WIDEVIEW,		AVERMEDIA_DVBT_USB_WARM),
> +	[2]  = DIB_DEVICE(COMPRO,		COMPRO_DVBU2000_COLD),
> +	[3]  = DIB_DEVICE(COMPRO,		COMPRO_DVBU2000_WARM),
> +	[4]  = DIB_DEVICE(COMPRO_UNK,		COMPRO_DVBU2000_UNK_COLD),
> +	[5]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3000_COLD),
> +	[6]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3000_WARM),
> +	[7]  = DIB_DEVICE(EMPIA,		KWORLD_VSTREAM_COLD),
> +	[8]  = DIB_DEVICE(EMPIA,		KWORLD_VSTREAM_WARM),
> +	[9]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB_COLD),
> +	[10] = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB_WARM),
> +	[11] = DIB_DEVICE(GRANDTEC,		DIBCOM_MOD3000_COLD),
> +	[12] = DIB_DEVICE(GRANDTEC,		DIBCOM_MOD3000_WARM),
> +	[13] = DIB_DEVICE(HYPER_PALTEK,		UNK_HYPER_PALTEK_COLD),
> +	[14] = DIB_DEVICE(HYPER_PALTEK,		UNK_HYPER_PALTEK_WARM),
> +	[15] = DIB_DEVICE(VISIONPLUS,		TWINHAN_VP7041_COLD),
> +	[16] = DIB_DEVICE(VISIONPLUS,		TWINHAN_VP7041_WARM),
> +	[17] = DIB_DEVICE(TWINHAN,		TWINHAN_VP7041_COLD),
> +	[18] = DIB_DEVICE(TWINHAN,		TWINHAN_VP7041_WARM),
> +	[19] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_COLD),
> +	[20] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_WARM),
> +	[21] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_AN2235_COLD),
> +	[22] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_AN2235_WARM),
> +	[23] = DIB_DEVICE(ADSTECH,		ADSTECH_USB2_COLD),
> 
>  /* device ID with default DIBUSB2_0-firmware and with the hacked
> firmware */
> -/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
> -/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
> -/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
> +	[24] = DIB_DEVICE(ADSTECH,		ADSTECH_USB2_WARM),
> +	[25] = DIB_DEVICE(KYE,			KYE_DVB_T_COLD),
> +	[26] = DIB_DEVICE(KYE,			KYE_DVB_T_WARM),
> 
> -/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
> +	[27] = DIB_DEVICE(KWORLD,		KWORLD_VSTREAM_COLD),
> 
> -/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_USB2_WARM) },
> +	[28] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_COLD),
> +	[29] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_WARM),
> 
>  /*
>   * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
> devices
> @@ -166,13 +169,15 @@ static struct usb_device_id dibusb_dib3000mb_table
> [] = {
>   */
> 
>  #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
> -/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
> +	[30] = DIB_DEVICE(ANCHOR,		ULTIMA_TVBOX_ANCHOR_COLD),
>  #endif
> 
> -			{ }		/* Terminating entry */
> +	{ }		/* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);
> 
> +#undef DIB_DEVICE
> +
>  static struct dvb_usb_device_properties dibusb1_1_properties = {
>  	.caps =  DVB_USB_IS_AN_I2C_ADAPTER,
> 
> diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c
> b/drivers/media/usb/dvb-usb/dibusb-mc.c
> index e2689977c8c8..703c2a7df369 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-mc.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
> @@ -23,28 +23,33 @@ static int dibusb_mc_probe(struct usb_interface *intf,
>  				   NULL, adapter_nr);
>  }
> 
> +#define DIB_DEVICE(vid, pid)	\
> +	{ USB_DEVICE(USB_VID_##vid, USB_PID_##pid) }
> +
>  /* do not change the order of the ID table */
>  static struct usb_device_id dibusb_dib3000mc_table [] = {
> -/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
> -/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
> -/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_USB2_COLD) },
> -/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
> USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
> -/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
> -/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
> -/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
> -/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
> -/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,
> USB_PID_GRANDTEC_DVBT_USB2_COLD) },
> -/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,
> USB_PID_GRANDTEC_DVBT_USB2_WARM) },
> -/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
> -/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
> -/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
> -/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
> -/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
> USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
> -/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
> USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
> -			{ }		/* Terminating entry */
> +	[0]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3001_COLD),
> +	[1]  = DIB_DEVICE(DIBCOM,		DIBCOM_MOD3001_WARM),
> +	[2]  = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_COLD),
> +	[3]  = DIB_DEVICE(ULTIMA_ELECTRONIC,	ULTIMA_TVBOX_USB2_WARM), // ( ? )
> +	[4]  = DIB_DEVICE(LITEON,		LITEON_DVB_T_COLD),
> +	[5]  = DIB_DEVICE(LITEON,		LITEON_DVB_T_WARM),
> +	[6]  = DIB_DEVICE(EMPIA,		DIGIVOX_MINI_SL_COLD),
> +	[7]  = DIB_DEVICE(EMPIA,		DIGIVOX_MINI_SL_WARM),
> +	[8]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB2_COLD),
> +	[9]  = DIB_DEVICE(GRANDTEC,		GRANDTEC_DVBT_USB2_WARM),
> +	[10] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ARTEC_T14_COLD),
> +	[11] = DIB_DEVICE(ULTIMA_ELECTRONIC,	ARTEC_T14_WARM),
> +	[12] = DIB_DEVICE(LEADTEK,		WINFAST_DTV_DONGLE_COLD),
> +	[13] = DIB_DEVICE(LEADTEK,		WINFAST_DTV_DONGLE_WARM),
> +	[14] = DIB_DEVICE(HUMAX_COEX,		DVB_T_USB_STICK_HIGH_SPEED_COLD),
> +	[15] = DIB_DEVICE(HUMAX_COEX,		DVB_T_USB_STICK_HIGH_SPEED_WARM),
> +	{ }					/* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
> 
> +#undef DIB_DEVICE
> +
>  static struct dvb_usb_device_properties dibusb_mc_properties = {
>  	.caps = DVB_USB_IS_AN_I2C_ADAPTER,
> 



Thanks,
Mauro

[PATCH 16/22 v2] dvb-usb: Replace comments with C99 initializers

[Benjamin Stürz]

Changes since v1:
 * Reformatted both tables
 * Respecting 80-column line limit

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/media/usb/dvb-usb/dibusb-mb.c | 148 ++++++++++++++++++--------
 drivers/media/usb/dvb-usb/dibusb-mc.c |  67 +++++++++---
 2 files changed, 154 insertions(+), 61 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c
b/drivers/media/usb/dvb-usb/dibusb-mb.c
index e9dc27f73970..ffc27318f823 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mb.c
@@ -122,54 +122,114 @@ static int dibusb_probe(struct usb_interface *intf,

 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mb_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_WIDEVIEW,	
USB_PID_AVERMEDIA_DVBT_USB_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_COMPRO,		USB_PID_COMPRO_DVBU2000_WARM) },
-/* 04 */	{ USB_DEVICE(USB_VID_COMPRO_UNK,
USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 06 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_COLD) },
-/* 08 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_KWORLD_VSTREAM_WARM) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 10 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 11 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_COLD) },
-/* 12 */	{ USB_DEVICE(USB_VID_GRANDTEC,		USB_PID_DIBCOM_MOD3000_WARM) },
-/* 13 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 14 */	{ USB_DEVICE(USB_VID_HYPER_PALTEK,
USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 15 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_COLD) },
-/* 16 */	{ USB_DEVICE(USB_VID_VISIONPLUS,	USB_PID_TWINHAN_VP7041_WARM) },
-/* 17 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_COLD) },
-/* 18 */	{ USB_DEVICE(USB_VID_TWINHAN,		USB_PID_TWINHAN_VP7041_WARM) },
-/* 19 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_COLD) },
-/* 20 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_WARM) },
-/* 21 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 22 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 23 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_COLD) },
-
-/* device ID with default DIBUSB2_0-firmware and with the hacked
firmware */
-/* 24 */	{ USB_DEVICE(USB_VID_ADSTECH,		USB_PID_ADSTECH_USB2_WARM) },
-/* 25 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_COLD) },
-/* 26 */	{ USB_DEVICE(USB_VID_KYE,		USB_PID_KYE_DVB_T_WARM) },
-
-/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },
-
-/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) },
-
-/*
- * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
devices
- *      we don't catch these faulty IDs (namely 'Cypress FX1 USB
controller') that
- *      have been left on the device. If you don't have such a device
but an Artec
- *      device that's supposed to work with this driver but is not
detected by it,
- *      free to enable CONFIG_DVB_USB_DIBUSB_MB_FAULTY via your kernel
config.
- */
+	[0]  = { USB_DEVICE(USB_VID_WIDEVIEW,
+			    USB_PID_AVERMEDIA_DVBT_USB_COLD)
+	},
+	[1]  = { USB_DEVICE(USB_VID_WIDEVIEW,
+			    USB_PID_AVERMEDIA_DVBT_USB_WARM)
+	},
+	[2]  = { USB_DEVICE(USB_VID_COMPRO,
+			    USB_PID_COMPRO_DVBU2000_COLD)
+	},
+	[3]  = { USB_DEVICE(USB_VID_COMPRO,
+			    USB_PID_COMPRO_DVBU2000_WARM)
+	},
+	[4]  = { USB_DEVICE(USB_VID_COMPRO_UNK,
+			    USB_PID_COMPRO_DVBU2000_UNK_COLD)
+	},
+	[5]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3000_COLD)
+	},
+	[6]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3000_WARM)
+	},
+	[7]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_KWORLD_VSTREAM_COLD)
+	},
+	[8]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_KWORLD_VSTREAM_WARM)
+	},
+	[9]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB_COLD)
+	},
+	[10] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB_WARM)
+	},
+	[11] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_DIBCOM_MOD3000_COLD)
+	},
+	[12] = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_DIBCOM_MOD3000_WARM)
+	},
+	[13] = { USB_DEVICE(USB_VID_HYPER_PALTEK,
+			    USB_PID_UNK_HYPER_PALTEK_COLD)
+	},
+	[14] = { USB_DEVICE(USB_VID_HYPER_PALTEK,
+			    USB_PID_UNK_HYPER_PALTEK_WARM)
+	},
+	[15] = { USB_DEVICE(USB_VID_VISIONPLUS,
+			    USB_PID_TWINHAN_VP7041_COLD)
+	},
+	[16] = { USB_DEVICE(USB_VID_VISIONPLUS,
+			    USB_PID_TWINHAN_VP7041_WARM)
+	},
+	[17] = { USB_DEVICE(USB_VID_TWINHAN,
+			    USB_PID_TWINHAN_VP7041_COLD)
+	},
+	[18] = { USB_DEVICE(USB_VID_TWINHAN,
+			    USB_PID_TWINHAN_VP7041_WARM)
+	},
+	[19] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_COLD)
+	},
+	[20] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_WARM)
+	},
+	[21] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_AN2235_COLD)
+	},
+	[22] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_AN2235_WARM)
+	},
+	[23] = { USB_DEVICE(USB_VID_ADSTECH,
+			    USB_PID_ADSTECH_USB2_COLD)
+	},
+
+	/* device ID with default DIBUSB2_0-firmware and with the hacked
firmware */
+	[24] = { USB_DEVICE(USB_VID_ADSTECH,
+			    USB_PID_ADSTECH_USB2_WARM)
+	},
+	[25] = { USB_DEVICE(USB_VID_KYE,
+			    USB_PID_KYE_DVB_T_COLD)
+	},
+	[26] = { USB_DEVICE(USB_VID_KYE,
+			    USB_PID_KYE_DVB_T_WARM)
+	},
+	[27] = { USB_DEVICE(USB_VID_KWORLD,
+			    USB_PID_KWORLD_VSTREAM_COLD)
+	},
+	[28] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_COLD)
+	},
+	[29] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_WARM)
+	},
+
+	/*
+	 * XXX: As Artec just 'forgot' to program the EEPROM on some Artec T1
devices
+	 *      we don't catch these faulty IDs (namely 'Cypress FX1 USB
controller') that
+	 *      have been left on the device. If you don't have such a device
but an Artec
+	 *      device that's supposed to work with this driver but is not
detected by it,
+	 *      free to enable CONFIG_DVB_USB_DIBUSB_MB_FAULTY via your kernel
config.
+	 */

 #ifdef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
-/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+	[30] = { USB_DEVICE(USB_VID_ANCHOR,
+			    USB_PID_ULTIMA_TVBOX_ANCHOR_COLD)
+	},
 #endif

-			{ }		/* Terminating entry */
+	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);

diff --git a/drivers/media/usb/dvb-usb/dibusb-mc.c
b/drivers/media/usb/dvb-usb/dibusb-mc.c
index e2689977c8c8..57805013f3ac 100644
--- a/drivers/media/usb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/usb/dvb-usb/dibusb-mc.c
@@ -25,23 +25,56 @@ static int dibusb_mc_probe(struct usb_interface *intf,

 /* do not change the order of the ID table */
 static struct usb_device_id dibusb_dib3000mc_table [] = {
-/* 00 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_COLD) },
-/* 01 */	{ USB_DEVICE(USB_VID_DIBCOM,		USB_PID_DIBCOM_MOD3001_WARM) },
-/* 02 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-/* 03 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
USB_PID_ULTIMA_TVBOX_USB2_WARM) }, // ( ? )
-/* 04 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_COLD) },
-/* 05 */	{ USB_DEVICE(USB_VID_LITEON,		USB_PID_LITEON_DVB_T_WARM) },
-/* 06 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_COLD) },
-/* 07 */	{ USB_DEVICE(USB_VID_EMPIA,		USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */	{ USB_DEVICE(USB_VID_GRANDTEC,
USB_PID_GRANDTEC_DVBT_USB2_WARM) },
-/* 10 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_COLD) },
-/* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
-/* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
-/* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
-/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
-/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,
USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
-			{ }		/* Terminating entry */
+	[0]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3001_COLD)
+	},
+	[1]  = { USB_DEVICE(USB_VID_DIBCOM,
+			    USB_PID_DIBCOM_MOD3001_WARM)
+	},
+	[2]  = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ULTIMA_TVBOX_USB2_COLD)
+	},
+	[3]  = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    // ( ? )
+			    USB_PID_ULTIMA_TVBOX_USB2_WARM)
+	},
+	[4]  = { USB_DEVICE(USB_VID_LITEON,
+			    USB_PID_LITEON_DVB_T_COLD)
+	},
+	[5]  = { USB_DEVICE(USB_VID_LITEON,
+			    USB_PID_LITEON_DVB_T_WARM)
+	},
+	[6]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_DIGIVOX_MINI_SL_COLD)
+	},
+	[7]  = { USB_DEVICE(USB_VID_EMPIA,
+			    USB_PID_DIGIVOX_MINI_SL_WARM)
+	},
+	[8]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB2_COLD)
+	},
+	[9]  = { USB_DEVICE(USB_VID_GRANDTEC,
+			    USB_PID_GRANDTEC_DVBT_USB2_WARM)
+	},
+	[10] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ARTEC_T14_COLD)
+	},
+	[11] = { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,
+			    USB_PID_ARTEC_T14_WARM)
+	},
+	[12] = { USB_DEVICE(USB_VID_LEADTEK,
+			    USB_PID_WINFAST_DTV_DONGLE_COLD)
+	},
+	[13] = { USB_DEVICE(USB_VID_LEADTEK,
+			    USB_PID_WINFAST_DTV_DONGLE_WARM)
+	},
+	[14] = { USB_DEVICE(USB_VID_HUMAX_COEX,
+			    USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD)
+	},
+	[15] = { USB_DEVICE(USB_VID_HUMAX_COEX,
+			    USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM)
+	},
+	{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);

-- 
2.35.1

[PATCH 17/22] cxl: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/misc/cxl/hcalls.c | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/misc/cxl/hcalls.c b/drivers/misc/cxl/hcalls.c
index aba5e20eeb1f..ed2086d579d3 100644
--- a/drivers/misc/cxl/hcalls.c
+++ b/drivers/misc/cxl/hcalls.c
@@ -86,32 +86,32 @@
 
 
 static char *afu_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"SUSPEND_PROCESS",	/* 2 */
-	"RESUME_PROCESS",	/* 3 */
-	"READ_ERR_STATE",	/* 4 */
-	"GET_AFU_ERR",		/* 5 */
-	"GET_CONFIG",		/* 6 */
-	"GET_DOWNLOAD_STATE",	/* 7 */
-	"TERMINATE_PROCESS",	/* 8 */
-	"COLLECT_VPD",		/* 9 */
-	"UNKNOWN_OP",		/* 10 undefined */
-	"GET_FUNCTION_ERR_INT",	/* 11 */
-	"ACK_FUNCTION_ERR_INT",	/* 12 */
-	"GET_ERROR_LOG",	/* 13 */
+	[0]  = "UNKNOWN_OP",		         /* undefined */
+	[1]  = "RESET",
+	[2]  = "SUSPEND_PROCESS",
+	[3]  = "RESUME_PROCESS",
+	[4]  = "READ_ERR_STATE",
+	[5]  = "GET_AFU_ERR",
+	[6]  = "GET_CONFIG",
+	[7]  = "GET_DOWNLOAD_STATE",
+	[8]  = "TERMINATE_PROCESS",
+	[9]  = "COLLECT_VPD",
+	[10] = "UNKNOWN_OP",		         /*  undefined */
+	[11] = "GET_FUNCTION_ERR_INT",
+	[12] = "ACK_FUNCTION_ERR_INT",
+	[13] = "GET_ERROR_LOG",
 };
 
 static char *control_adapter_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"COLLECT_VPD",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "RESET",
+	[2] = "COLLECT_VPD",
 };
 
 static char *download_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"DOWNLOAD",		/* 1 */
-	"VALIDATE",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "DOWNLOAD",
+	[2] = "VALIDATE",
 };
 
 static char *op_str(unsigned int op, char *name_array[], int array_len)
-- 
2.35.1

[PATCH 17/22] cxl: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/misc/cxl/hcalls.c | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/misc/cxl/hcalls.c b/drivers/misc/cxl/hcalls.c
index aba5e20eeb1f..ed2086d579d3 100644
--- a/drivers/misc/cxl/hcalls.c
+++ b/drivers/misc/cxl/hcalls.c
@@ -86,32 +86,32 @@
 
 
 static char *afu_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"SUSPEND_PROCESS",	/* 2 */
-	"RESUME_PROCESS",	/* 3 */
-	"READ_ERR_STATE",	/* 4 */
-	"GET_AFU_ERR",		/* 5 */
-	"GET_CONFIG",		/* 6 */
-	"GET_DOWNLOAD_STATE",	/* 7 */
-	"TERMINATE_PROCESS",	/* 8 */
-	"COLLECT_VPD",		/* 9 */
-	"UNKNOWN_OP",		/* 10 undefined */
-	"GET_FUNCTION_ERR_INT",	/* 11 */
-	"ACK_FUNCTION_ERR_INT",	/* 12 */
-	"GET_ERROR_LOG",	/* 13 */
+	[0]  = "UNKNOWN_OP",		         /* undefined */
+	[1]  = "RESET",
+	[2]  = "SUSPEND_PROCESS",
+	[3]  = "RESUME_PROCESS",
+	[4]  = "READ_ERR_STATE",
+	[5]  = "GET_AFU_ERR",
+	[6]  = "GET_CONFIG",
+	[7]  = "GET_DOWNLOAD_STATE",
+	[8]  = "TERMINATE_PROCESS",
+	[9]  = "COLLECT_VPD",
+	[10] = "UNKNOWN_OP",		         /*  undefined */
+	[11] = "GET_FUNCTION_ERR_INT",
+	[12] = "ACK_FUNCTION_ERR_INT",
+	[13] = "GET_ERROR_LOG",
 };
 
 static char *control_adapter_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"COLLECT_VPD",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "RESET",
+	[2] = "COLLECT_VPD",
 };
 
 static char *download_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"DOWNLOAD",		/* 1 */
-	"VALIDATE",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "DOWNLOAD",
+	[2] = "VALIDATE",
 };
 
 static char *op_str(unsigned int op, char *name_array[], int array_len)
-- 
2.35.1

[PATCH 17/22] cxl: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/misc/cxl/hcalls.c | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/misc/cxl/hcalls.c b/drivers/misc/cxl/hcalls.c
index aba5e20eeb1f..ed2086d579d3 100644
--- a/drivers/misc/cxl/hcalls.c
+++ b/drivers/misc/cxl/hcalls.c
@@ -86,32 +86,32 @@
 
 
 static char *afu_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"SUSPEND_PROCESS",	/* 2 */
-	"RESUME_PROCESS",	/* 3 */
-	"READ_ERR_STATE",	/* 4 */
-	"GET_AFU_ERR",		/* 5 */
-	"GET_CONFIG",		/* 6 */
-	"GET_DOWNLOAD_STATE",	/* 7 */
-	"TERMINATE_PROCESS",	/* 8 */
-	"COLLECT_VPD",		/* 9 */
-	"UNKNOWN_OP",		/* 10 undefined */
-	"GET_FUNCTION_ERR_INT",	/* 11 */
-	"ACK_FUNCTION_ERR_INT",	/* 12 */
-	"GET_ERROR_LOG",	/* 13 */
+	[0]  = "UNKNOWN_OP",		         /* undefined */
+	[1]  = "RESET",
+	[2]  = "SUSPEND_PROCESS",
+	[3]  = "RESUME_PROCESS",
+	[4]  = "READ_ERR_STATE",
+	[5]  = "GET_AFU_ERR",
+	[6]  = "GET_CONFIG",
+	[7]  = "GET_DOWNLOAD_STATE",
+	[8]  = "TERMINATE_PROCESS",
+	[9]  = "COLLECT_VPD",
+	[10] = "UNKNOWN_OP",		         /*  undefined */
+	[11] = "GET_FUNCTION_ERR_INT",
+	[12] = "ACK_FUNCTION_ERR_INT",
+	[13] = "GET_ERROR_LOG",
 };
 
 static char *control_adapter_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"RESET",		/* 1 */
-	"COLLECT_VPD",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "RESET",
+	[2] = "COLLECT_VPD",
 };
 
 static char *download_op_names[] = {
-	"UNKNOWN_OP",		/* 0 undefined */
-	"DOWNLOAD",		/* 1 */
-	"VALIDATE",		/* 2 */
+	[0] = "UNKNOWN_OP",		         /* undefined */
+	[1] = "DOWNLOAD",
+	[2] = "VALIDATE",
 };
 
 static char *op_str(unsigned int op, char *name_array[], int array_len)
-- 
2.35.1

[PATCH 18/22] smsc: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/ethernet/smsc/smc9194.h | 15 ++++++---------
 drivers/net/ethernet/smsc/smc91x.h  | 18 ++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/smsc/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h
index cf69d0a5a1cb..e1c780afb9bb 100644
--- a/drivers/net/ethernet/smsc/smc9194.h
+++ b/drivers/net/ethernet/smsc/smc9194.h
@@ -163,15 +163,12 @@ typedef unsigned long int 		dword;
 #define CHIP_91100	7
 
 static const char * chip_ids[ 15 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	NULL,
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+};
 
 /*
  . Transmit status bits
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 387539a8094b..122cdc849507 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -731,16 +731,14 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
 #define CHIP_91111FD	9
 
 static const char * chip_ids[ 16 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	/* 6 */ "SMC91C96",
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	/* 9 */ "SMC91C11xFD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[6] = "SMC91C96",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+	[9] = "SMC91C11xFD",
+};
 
 
 /*
-- 
2.35.1

[PATCH 18/22] smsc: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/ethernet/smsc/smc9194.h | 15 ++++++---------
 drivers/net/ethernet/smsc/smc91x.h  | 18 ++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/smsc/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h
index cf69d0a5a1cb..e1c780afb9bb 100644
--- a/drivers/net/ethernet/smsc/smc9194.h
+++ b/drivers/net/ethernet/smsc/smc9194.h
@@ -163,15 +163,12 @@ typedef unsigned long int 		dword;
 #define CHIP_91100	7
 
 static const char * chip_ids[ 15 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	NULL,
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+};
 
 /*
  . Transmit status bits
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 387539a8094b..122cdc849507 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -731,16 +731,14 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
 #define CHIP_91111FD	9
 
 static const char * chip_ids[ 16 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	/* 6 */ "SMC91C96",
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	/* 9 */ "SMC91C11xFD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[6] = "SMC91C96",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+	[9] = "SMC91C11xFD",
+};
 
 
 /*
-- 
2.35.1

[PATCH 18/22] smsc: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/ethernet/smsc/smc9194.h | 15 ++++++---------
 drivers/net/ethernet/smsc/smc91x.h  | 18 ++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/smsc/smc9194.h b/drivers/net/ethernet/smsc/smc9194.h
index cf69d0a5a1cb..e1c780afb9bb 100644
--- a/drivers/net/ethernet/smsc/smc9194.h
+++ b/drivers/net/ethernet/smsc/smc9194.h
@@ -163,15 +163,12 @@ typedef unsigned long int 		dword;
 #define CHIP_91100	7
 
 static const char * chip_ids[ 15 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	NULL,
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+};
 
 /*
  . Transmit status bits
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 387539a8094b..122cdc849507 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -731,16 +731,14 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
 #define CHIP_91111FD	9
 
 static const char * chip_ids[ 16 ] =  {
-	NULL, NULL, NULL,
-	/* 3 */ "SMC91C90/91C92",
-	/* 4 */ "SMC91C94",
-	/* 5 */ "SMC91C95",
-	/* 6 */ "SMC91C96",
-	/* 7 */ "SMC91C100",
-	/* 8 */ "SMC91C100FD",
-	/* 9 */ "SMC91C11xFD",
-	NULL, NULL, NULL,
-	NULL, NULL, NULL};
+	[3] = "SMC91C90/91C92",
+	[4] = "SMC91C94",
+	[5] = "SMC91C95",
+	[6] = "SMC91C96",
+	[7] = "SMC91C100",
+	[8] = "SMC91C100FD",
+	[9] = "SMC91C11xFD",
+};
 
 
 /*
-- 
2.35.1

[PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 95ea7d040d8c..0fed64bd37b4 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
 }
 
 static const char * const wcn36xx_caps_names[] = {
-	"MCC",				/* 0 */
-	"P2P",				/* 1 */
-	"DOT11AC",			/* 2 */
-	"SLM_SESSIONIZATION",		/* 3 */
-	"DOT11AC_OPMODE",		/* 4 */
-	"SAP32STA",			/* 5 */
-	"TDLS",				/* 6 */
-	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
-	"WLANACTIVE_OFFLOAD",		/* 8 */
-	"BEACON_OFFLOAD",		/* 9 */
-	"SCAN_OFFLOAD",			/* 10 */
-	"ROAM_OFFLOAD",			/* 11 */
-	"BCN_MISS_OFFLOAD",		/* 12 */
-	"STA_POWERSAVE",		/* 13 */
-	"STA_ADVANCED_PWRSAVE",		/* 14 */
-	"AP_UAPSD",			/* 15 */
-	"AP_DFS",			/* 16 */
-	"BLOCKACK",			/* 17 */
-	"PHY_ERR",			/* 18 */
-	"BCN_FILTER",			/* 19 */
-	"RTT",				/* 20 */
-	"RATECTRL",			/* 21 */
-	"WOW",				/* 22 */
-	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
-	"SPECULATIVE_PS_POLL",		/* 24 */
-	"SCAN_SCH",			/* 25 */
-	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
-	"WLAN_SCAN_OFFLOAD",		/* 27 */
-	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
-	"ADVANCE_TDLS",			/* 29 */
-	"BATCH_SCAN",			/* 30 */
-	"FW_IN_TX_PATH",		/* 31 */
-	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
-	"CH_SWITCH_V1",			/* 33 */
-	"HT40_OBSS_SCAN",		/* 34 */
-	"UPDATE_CHANNEL_LIST",		/* 35 */
-	"WLAN_MCADDR_FLT",		/* 36 */
-	"WLAN_CH144",			/* 37 */
-	"NAN",				/* 38 */
-	"TDLS_SCAN_COEXISTENCE",	/* 39 */
-	"LINK_LAYER_STATS_MEAS",	/* 40 */
-	"MU_MIMO",			/* 41 */
-	"EXTENDED_SCAN",		/* 42 */
-	"DYNAMIC_WMM_PS",		/* 43 */
-	"MAC_SPOOFED_SCAN",		/* 44 */
-	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
-	"DISA",				/* 46 */
-	"FW_STATS",			/* 47 */
-	"WPS_PRBRSP_TMPL",		/* 48 */
-	"BCN_IE_FLT_DELTA",		/* 49 */
-	"TDLS_OFF_CHANNEL",		/* 51 */
-	"RTT3",				/* 52 */
-	"MGMT_FRAME_LOGGING",		/* 53 */
-	"ENHANCED_TXBD_COMPLETION",	/* 54 */
-	"LOGGING_ENHANCEMENT",		/* 55 */
-	"EXT_SCAN_ENHANCED",		/* 56 */
-	"MEMORY_DUMP_SUPPORTED",	/* 57 */
-	"PER_PKT_STATS_SUPPORTED",	/* 58 */
-	"EXT_LL_STAT",			/* 60 */
-	"WIFI_CONFIG",			/* 61 */
-	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
+	[0]  = "MCC",
+	[1]  = "P2P",
+	[2]  = "DOT11AC",
+	[3]  = "SLM_SESSIONIZATION",
+	[4]  = "DOT11AC_OPMODE",
+	[5]  = "SAP32STA",
+	[6]  = "TDLS",
+	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
+	[8]  = "WLANACTIVE_OFFLOAD",
+	[9]  = "BEACON_OFFLOAD",
+	[10] = "SCAN_OFFLOAD",
+	[11] = "ROAM_OFFLOAD",
+	[12] = "BCN_MISS_OFFLOAD",
+	[13] = "STA_POWERSAVE",
+	[14] = "STA_ADVANCED_PWRSAVE",
+	[15] = "AP_UAPSD",
+	[16] = "AP_DFS",
+	[17] = "BLOCKACK",
+	[18] = "PHY_ERR",
+	[19] = "BCN_FILTER",
+	[20] = "RTT",
+	[21] = "RATECTRL",
+	[22] = "WOW",
+	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
+	[24] = "SPECULATIVE_PS_POLL",
+	[25] = "SCAN_SCH",
+	[26] = "IBSS_HEARTBEAT_OFFLOAD",
+	[27] = "WLAN_SCAN_OFFLOAD",
+	[28] = "WLAN_PERIODIC_TX_PTRN",
+	[29] = "ADVANCE_TDLS",
+	[30] = "BATCH_SCAN",
+	[31] = "FW_IN_TX_PATH",
+	[32] = "EXTENDED_NSOFFLOAD_SLOT",
+	[33] = "CH_SWITCH_V1",
+	[34] = "HT40_OBSS_SCAN",
+	[35] = "UPDATE_CHANNEL_LIST",
+	[36] = "WLAN_MCADDR_FLT",
+	[37] = "WLAN_CH144",
+	[38] = "NAN",
+	[39] = "TDLS_SCAN_COEXISTENCE",
+	[40] = "LINK_LAYER_STATS_MEAS",
+	[41] = "MU_MIMO",
+	[42] = "EXTENDED_SCAN",
+	[43] = "DYNAMIC_WMM_PS",
+	[44] = "MAC_SPOOFED_SCAN",
+	[45] = "BMU_ERROR_GENERIC_RECOVERY",
+	[46] = "DISA",
+	[47] = "FW_STATS",
+	[48] = "WPS_PRBRSP_TMPL",
+	[49] = "BCN_IE_FLT_DELTA",
+	[51] = "TDLS_OFF_CHANNEL",
+	[52] = "RTT3",
+	[53] = "MGMT_FRAME_LOGGING",
+	[54] = "ENHANCED_TXBD_COMPLETION",
+	[55] = "LOGGING_ENHANCEMENT",
+	[56] = "EXT_SCAN_ENHANCED",
+	[57] = "MEMORY_DUMP_SUPPORTED",
+	[58] = "PER_PKT_STATS_SUPPORTED",
+	[60] = "EXT_LL_STAT",
+	[61] = "WIFI_CONFIG",
+	[62] = "ANTENNA_DIVERSITY_SELECTION",
 };
 
 static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
-- 
2.35.1

[PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 95ea7d040d8c..0fed64bd37b4 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
 }
 
 static const char * const wcn36xx_caps_names[] = {
-	"MCC",				/* 0 */
-	"P2P",				/* 1 */
-	"DOT11AC",			/* 2 */
-	"SLM_SESSIONIZATION",		/* 3 */
-	"DOT11AC_OPMODE",		/* 4 */
-	"SAP32STA",			/* 5 */
-	"TDLS",				/* 6 */
-	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
-	"WLANACTIVE_OFFLOAD",		/* 8 */
-	"BEACON_OFFLOAD",		/* 9 */
-	"SCAN_OFFLOAD",			/* 10 */
-	"ROAM_OFFLOAD",			/* 11 */
-	"BCN_MISS_OFFLOAD",		/* 12 */
-	"STA_POWERSAVE",		/* 13 */
-	"STA_ADVANCED_PWRSAVE",		/* 14 */
-	"AP_UAPSD",			/* 15 */
-	"AP_DFS",			/* 16 */
-	"BLOCKACK",			/* 17 */
-	"PHY_ERR",			/* 18 */
-	"BCN_FILTER",			/* 19 */
-	"RTT",				/* 20 */
-	"RATECTRL",			/* 21 */
-	"WOW",				/* 22 */
-	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
-	"SPECULATIVE_PS_POLL",		/* 24 */
-	"SCAN_SCH",			/* 25 */
-	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
-	"WLAN_SCAN_OFFLOAD",		/* 27 */
-	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
-	"ADVANCE_TDLS",			/* 29 */
-	"BATCH_SCAN",			/* 30 */
-	"FW_IN_TX_PATH",		/* 31 */
-	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
-	"CH_SWITCH_V1",			/* 33 */
-	"HT40_OBSS_SCAN",		/* 34 */
-	"UPDATE_CHANNEL_LIST",		/* 35 */
-	"WLAN_MCADDR_FLT",		/* 36 */
-	"WLAN_CH144",			/* 37 */
-	"NAN",				/* 38 */
-	"TDLS_SCAN_COEXISTENCE",	/* 39 */
-	"LINK_LAYER_STATS_MEAS",	/* 40 */
-	"MU_MIMO",			/* 41 */
-	"EXTENDED_SCAN",		/* 42 */
-	"DYNAMIC_WMM_PS",		/* 43 */
-	"MAC_SPOOFED_SCAN",		/* 44 */
-	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
-	"DISA",				/* 46 */
-	"FW_STATS",			/* 47 */
-	"WPS_PRBRSP_TMPL",		/* 48 */
-	"BCN_IE_FLT_DELTA",		/* 49 */
-	"TDLS_OFF_CHANNEL",		/* 51 */
-	"RTT3",				/* 52 */
-	"MGMT_FRAME_LOGGING",		/* 53 */
-	"ENHANCED_TXBD_COMPLETION",	/* 54 */
-	"LOGGING_ENHANCEMENT",		/* 55 */
-	"EXT_SCAN_ENHANCED",		/* 56 */
-	"MEMORY_DUMP_SUPPORTED",	/* 57 */
-	"PER_PKT_STATS_SUPPORTED",	/* 58 */
-	"EXT_LL_STAT",			/* 60 */
-	"WIFI_CONFIG",			/* 61 */
-	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
+	[0]  = "MCC",
+	[1]  = "P2P",
+	[2]  = "DOT11AC",
+	[3]  = "SLM_SESSIONIZATION",
+	[4]  = "DOT11AC_OPMODE",
+	[5]  = "SAP32STA",
+	[6]  = "TDLS",
+	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
+	[8]  = "WLANACTIVE_OFFLOAD",
+	[9]  = "BEACON_OFFLOAD",
+	[10] = "SCAN_OFFLOAD",
+	[11] = "ROAM_OFFLOAD",
+	[12] = "BCN_MISS_OFFLOAD",
+	[13] = "STA_POWERSAVE",
+	[14] = "STA_ADVANCED_PWRSAVE",
+	[15] = "AP_UAPSD",
+	[16] = "AP_DFS",
+	[17] = "BLOCKACK",
+	[18] = "PHY_ERR",
+	[19] = "BCN_FILTER",
+	[20] = "RTT",
+	[21] = "RATECTRL",
+	[22] = "WOW",
+	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
+	[24] = "SPECULATIVE_PS_POLL",
+	[25] = "SCAN_SCH",
+	[26] = "IBSS_HEARTBEAT_OFFLOAD",
+	[27] = "WLAN_SCAN_OFFLOAD",
+	[28] = "WLAN_PERIODIC_TX_PTRN",
+	[29] = "ADVANCE_TDLS",
+	[30] = "BATCH_SCAN",
+	[31] = "FW_IN_TX_PATH",
+	[32] = "EXTENDED_NSOFFLOAD_SLOT",
+	[33] = "CH_SWITCH_V1",
+	[34] = "HT40_OBSS_SCAN",
+	[35] = "UPDATE_CHANNEL_LIST",
+	[36] = "WLAN_MCADDR_FLT",
+	[37] = "WLAN_CH144",
+	[38] = "NAN",
+	[39] = "TDLS_SCAN_COEXISTENCE",
+	[40] = "LINK_LAYER_STATS_MEAS",
+	[41] = "MU_MIMO",
+	[42] = "EXTENDED_SCAN",
+	[43] = "DYNAMIC_WMM_PS",
+	[44] = "MAC_SPOOFED_SCAN",
+	[45] = "BMU_ERROR_GENERIC_RECOVERY",
+	[46] = "DISA",
+	[47] = "FW_STATS",
+	[48] = "WPS_PRBRSP_TMPL",
+	[49] = "BCN_IE_FLT_DELTA",
+	[51] = "TDLS_OFF_CHANNEL",
+	[52] = "RTT3",
+	[53] = "MGMT_FRAME_LOGGING",
+	[54] = "ENHANCED_TXBD_COMPLETION",
+	[55] = "LOGGING_ENHANCEMENT",
+	[56] = "EXT_SCAN_ENHANCED",
+	[57] = "MEMORY_DUMP_SUPPORTED",
+	[58] = "PER_PKT_STATS_SUPPORTED",
+	[60] = "EXT_LL_STAT",
+	[61] = "WIFI_CONFIG",
+	[62] = "ANTENNA_DIVERSITY_SELECTION",
 };
 
 static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
-- 
2.35.1

[PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 95ea7d040d8c..0fed64bd37b4 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
 }
 
 static const char * const wcn36xx_caps_names[] = {
-	"MCC",				/* 0 */
-	"P2P",				/* 1 */
-	"DOT11AC",			/* 2 */
-	"SLM_SESSIONIZATION",		/* 3 */
-	"DOT11AC_OPMODE",		/* 4 */
-	"SAP32STA",			/* 5 */
-	"TDLS",				/* 6 */
-	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
-	"WLANACTIVE_OFFLOAD",		/* 8 */
-	"BEACON_OFFLOAD",		/* 9 */
-	"SCAN_OFFLOAD",			/* 10 */
-	"ROAM_OFFLOAD",			/* 11 */
-	"BCN_MISS_OFFLOAD",		/* 12 */
-	"STA_POWERSAVE",		/* 13 */
-	"STA_ADVANCED_PWRSAVE",		/* 14 */
-	"AP_UAPSD",			/* 15 */
-	"AP_DFS",			/* 16 */
-	"BLOCKACK",			/* 17 */
-	"PHY_ERR",			/* 18 */
-	"BCN_FILTER",			/* 19 */
-	"RTT",				/* 20 */
-	"RATECTRL",			/* 21 */
-	"WOW",				/* 22 */
-	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
-	"SPECULATIVE_PS_POLL",		/* 24 */
-	"SCAN_SCH",			/* 25 */
-	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
-	"WLAN_SCAN_OFFLOAD",		/* 27 */
-	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
-	"ADVANCE_TDLS",			/* 29 */
-	"BATCH_SCAN",			/* 30 */
-	"FW_IN_TX_PATH",		/* 31 */
-	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
-	"CH_SWITCH_V1",			/* 33 */
-	"HT40_OBSS_SCAN",		/* 34 */
-	"UPDATE_CHANNEL_LIST",		/* 35 */
-	"WLAN_MCADDR_FLT",		/* 36 */
-	"WLAN_CH144",			/* 37 */
-	"NAN",				/* 38 */
-	"TDLS_SCAN_COEXISTENCE",	/* 39 */
-	"LINK_LAYER_STATS_MEAS",	/* 40 */
-	"MU_MIMO",			/* 41 */
-	"EXTENDED_SCAN",		/* 42 */
-	"DYNAMIC_WMM_PS",		/* 43 */
-	"MAC_SPOOFED_SCAN",		/* 44 */
-	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
-	"DISA",				/* 46 */
-	"FW_STATS",			/* 47 */
-	"WPS_PRBRSP_TMPL",		/* 48 */
-	"BCN_IE_FLT_DELTA",		/* 49 */
-	"TDLS_OFF_CHANNEL",		/* 51 */
-	"RTT3",				/* 52 */
-	"MGMT_FRAME_LOGGING",		/* 53 */
-	"ENHANCED_TXBD_COMPLETION",	/* 54 */
-	"LOGGING_ENHANCEMENT",		/* 55 */
-	"EXT_SCAN_ENHANCED",		/* 56 */
-	"MEMORY_DUMP_SUPPORTED",	/* 57 */
-	"PER_PKT_STATS_SUPPORTED",	/* 58 */
-	"EXT_LL_STAT",			/* 60 */
-	"WIFI_CONFIG",			/* 61 */
-	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
+	[0]  = "MCC",
+	[1]  = "P2P",
+	[2]  = "DOT11AC",
+	[3]  = "SLM_SESSIONIZATION",
+	[4]  = "DOT11AC_OPMODE",
+	[5]  = "SAP32STA",
+	[6]  = "TDLS",
+	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
+	[8]  = "WLANACTIVE_OFFLOAD",
+	[9]  = "BEACON_OFFLOAD",
+	[10] = "SCAN_OFFLOAD",
+	[11] = "ROAM_OFFLOAD",
+	[12] = "BCN_MISS_OFFLOAD",
+	[13] = "STA_POWERSAVE",
+	[14] = "STA_ADVANCED_PWRSAVE",
+	[15] = "AP_UAPSD",
+	[16] = "AP_DFS",
+	[17] = "BLOCKACK",
+	[18] = "PHY_ERR",
+	[19] = "BCN_FILTER",
+	[20] = "RTT",
+	[21] = "RATECTRL",
+	[22] = "WOW",
+	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
+	[24] = "SPECULATIVE_PS_POLL",
+	[25] = "SCAN_SCH",
+	[26] = "IBSS_HEARTBEAT_OFFLOAD",
+	[27] = "WLAN_SCAN_OFFLOAD",
+	[28] = "WLAN_PERIODIC_TX_PTRN",
+	[29] = "ADVANCE_TDLS",
+	[30] = "BATCH_SCAN",
+	[31] = "FW_IN_TX_PATH",
+	[32] = "EXTENDED_NSOFFLOAD_SLOT",
+	[33] = "CH_SWITCH_V1",
+	[34] = "HT40_OBSS_SCAN",
+	[35] = "UPDATE_CHANNEL_LIST",
+	[36] = "WLAN_MCADDR_FLT",
+	[37] = "WLAN_CH144",
+	[38] = "NAN",
+	[39] = "TDLS_SCAN_COEXISTENCE",
+	[40] = "LINK_LAYER_STATS_MEAS",
+	[41] = "MU_MIMO",
+	[42] = "EXTENDED_SCAN",
+	[43] = "DYNAMIC_WMM_PS",
+	[44] = "MAC_SPOOFED_SCAN",
+	[45] = "BMU_ERROR_GENERIC_RECOVERY",
+	[46] = "DISA",
+	[47] = "FW_STATS",
+	[48] = "WPS_PRBRSP_TMPL",
+	[49] = "BCN_IE_FLT_DELTA",
+	[51] = "TDLS_OFF_CHANNEL",
+	[52] = "RTT3",
+	[53] = "MGMT_FRAME_LOGGING",
+	[54] = "ENHANCED_TXBD_COMPLETION",
+	[55] = "LOGGING_ENHANCEMENT",
+	[56] = "EXT_SCAN_ENHANCED",
+	[57] = "MEMORY_DUMP_SUPPORTED",
+	[58] = "PER_PKT_STATS_SUPPORTED",
+	[60] = "EXT_LL_STAT",
+	[61] = "WIFI_CONFIG",
+	[62] = "ANTENNA_DIVERSITY_SELECTION",
 };
 
 static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
-- 
2.35.1

Re: [PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Jeff Johnson]

On 3/26/2022 9:59 AM, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
>   1 file changed, 61 insertions(+), 61 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index 95ea7d040d8c..0fed64bd37b4 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
>   }
>   
>   static const char * const wcn36xx_caps_names[] = {
> -	"MCC",				/* 0 */
> -	"P2P",				/* 1 */
> -	"DOT11AC",			/* 2 */
> -	"SLM_SESSIONIZATION",		/* 3 */
> -	"DOT11AC_OPMODE",		/* 4 */
> -	"SAP32STA",			/* 5 */
> -	"TDLS",				/* 6 */
> -	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
> -	"WLANACTIVE_OFFLOAD",		/* 8 */
> -	"BEACON_OFFLOAD",		/* 9 */
> -	"SCAN_OFFLOAD",			/* 10 */
> -	"ROAM_OFFLOAD",			/* 11 */
> -	"BCN_MISS_OFFLOAD",		/* 12 */
> -	"STA_POWERSAVE",		/* 13 */
> -	"STA_ADVANCED_PWRSAVE",		/* 14 */
> -	"AP_UAPSD",			/* 15 */
> -	"AP_DFS",			/* 16 */
> -	"BLOCKACK",			/* 17 */
> -	"PHY_ERR",			/* 18 */
> -	"BCN_FILTER",			/* 19 */
> -	"RTT",				/* 20 */
> -	"RATECTRL",			/* 21 */
> -	"WOW",				/* 22 */
> -	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
> -	"SPECULATIVE_PS_POLL",		/* 24 */
> -	"SCAN_SCH",			/* 25 */
> -	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
> -	"WLAN_SCAN_OFFLOAD",		/* 27 */
> -	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
> -	"ADVANCE_TDLS",			/* 29 */
> -	"BATCH_SCAN",			/* 30 */
> -	"FW_IN_TX_PATH",		/* 31 */
> -	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
> -	"CH_SWITCH_V1",			/* 33 */
> -	"HT40_OBSS_SCAN",		/* 34 */
> -	"UPDATE_CHANNEL_LIST",		/* 35 */
> -	"WLAN_MCADDR_FLT",		/* 36 */
> -	"WLAN_CH144",			/* 37 */
> -	"NAN",				/* 38 */
> -	"TDLS_SCAN_COEXISTENCE",	/* 39 */
> -	"LINK_LAYER_STATS_MEAS",	/* 40 */
> -	"MU_MIMO",			/* 41 */
> -	"EXTENDED_SCAN",		/* 42 */
> -	"DYNAMIC_WMM_PS",		/* 43 */
> -	"MAC_SPOOFED_SCAN",		/* 44 */
> -	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
> -	"DISA",				/* 46 */
> -	"FW_STATS",			/* 47 */
> -	"WPS_PRBRSP_TMPL",		/* 48 */
> -	"BCN_IE_FLT_DELTA",		/* 49 */
> -	"TDLS_OFF_CHANNEL",		/* 51 */
> -	"RTT3",				/* 52 */
> -	"MGMT_FRAME_LOGGING",		/* 53 */
> -	"ENHANCED_TXBD_COMPLETION",	/* 54 */
> -	"LOGGING_ENHANCEMENT",		/* 55 */
> -	"EXT_SCAN_ENHANCED",		/* 56 */
> -	"MEMORY_DUMP_SUPPORTED",	/* 57 */
> -	"PER_PKT_STATS_SUPPORTED",	/* 58 */
> -	"EXT_LL_STAT",			/* 60 */
> -	"WIFI_CONFIG",			/* 61 */
> -	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
> +	[0]  = "MCC",
> +	[1]  = "P2P",
> +	[2]  = "DOT11AC",
> +	[3]  = "SLM_SESSIONIZATION",
> +	[4]  = "DOT11AC_OPMODE",
> +	[5]  = "SAP32STA",
> +	[6]  = "TDLS",
> +	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
> +	[8]  = "WLANACTIVE_OFFLOAD",
> +	[9]  = "BEACON_OFFLOAD",
> +	[10] = "SCAN_OFFLOAD",
> +	[11] = "ROAM_OFFLOAD",
> +	[12] = "BCN_MISS_OFFLOAD",
> +	[13] = "STA_POWERSAVE",
> +	[14] = "STA_ADVANCED_PWRSAVE",
> +	[15] = "AP_UAPSD",
> +	[16] = "AP_DFS",
> +	[17] = "BLOCKACK",
> +	[18] = "PHY_ERR",
> +	[19] = "BCN_FILTER",
> +	[20] = "RTT",
> +	[21] = "RATECTRL",
> +	[22] = "WOW",
> +	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
> +	[24] = "SPECULATIVE_PS_POLL",
> +	[25] = "SCAN_SCH",
> +	[26] = "IBSS_HEARTBEAT_OFFLOAD",
> +	[27] = "WLAN_SCAN_OFFLOAD",
> +	[28] = "WLAN_PERIODIC_TX_PTRN",
> +	[29] = "ADVANCE_TDLS",
> +	[30] = "BATCH_SCAN",
> +	[31] = "FW_IN_TX_PATH",
> +	[32] = "EXTENDED_NSOFFLOAD_SLOT",
> +	[33] = "CH_SWITCH_V1",
> +	[34] = "HT40_OBSS_SCAN",
> +	[35] = "UPDATE_CHANNEL_LIST",
> +	[36] = "WLAN_MCADDR_FLT",
> +	[37] = "WLAN_CH144",
> +	[38] = "NAN",
> +	[39] = "TDLS_SCAN_COEXISTENCE",
> +	[40] = "LINK_LAYER_STATS_MEAS",
> +	[41] = "MU_MIMO",
> +	[42] = "EXTENDED_SCAN",
> +	[43] = "DYNAMIC_WMM_PS",
> +	[44] = "MAC_SPOOFED_SCAN",
> +	[45] = "BMU_ERROR_GENERIC_RECOVERY",
> +	[46] = "DISA",
> +	[47] = "FW_STATS",
> +	[48] = "WPS_PRBRSP_TMPL",
> +	[49] = "BCN_IE_FLT_DELTA",
> +	[51] = "TDLS_OFF_CHANNEL",
> +	[52] = "RTT3",
> +	[53] = "MGMT_FRAME_LOGGING",
> +	[54] = "ENHANCED_TXBD_COMPLETION",
> +	[55] = "LOGGING_ENHANCEMENT",
> +	[56] = "EXT_SCAN_ENHANCED",
> +	[57] = "MEMORY_DUMP_SUPPORTED",
> +	[58] = "PER_PKT_STATS_SUPPORTED",
> +	[60] = "EXT_LL_STAT",
> +	[61] = "WIFI_CONFIG",
> +	[62] = "ANTENNA_DIVERSITY_SELECTION",
>   };
>   
>   static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)

I know there has been much discussion on this series. For this specific 
patch this would be a great change if you use the actual enumerations 
from enum place_holder_in_cap_bitmap as the index values,
i.e.
  [MCC] = "MCC",
  etc.

So a v2 for this patch would be appreciated

Re: [PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Jeff Johnson]

On 3/26/2022 9:59 AM, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
>   1 file changed, 61 insertions(+), 61 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index 95ea7d040d8c..0fed64bd37b4 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
>   }
>   
>   static const char * const wcn36xx_caps_names[] = {
> -	"MCC",				/* 0 */
> -	"P2P",				/* 1 */
> -	"DOT11AC",			/* 2 */
> -	"SLM_SESSIONIZATION",		/* 3 */
> -	"DOT11AC_OPMODE",		/* 4 */
> -	"SAP32STA",			/* 5 */
> -	"TDLS",				/* 6 */
> -	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
> -	"WLANACTIVE_OFFLOAD",		/* 8 */
> -	"BEACON_OFFLOAD",		/* 9 */
> -	"SCAN_OFFLOAD",			/* 10 */
> -	"ROAM_OFFLOAD",			/* 11 */
> -	"BCN_MISS_OFFLOAD",		/* 12 */
> -	"STA_POWERSAVE",		/* 13 */
> -	"STA_ADVANCED_PWRSAVE",		/* 14 */
> -	"AP_UAPSD",			/* 15 */
> -	"AP_DFS",			/* 16 */
> -	"BLOCKACK",			/* 17 */
> -	"PHY_ERR",			/* 18 */
> -	"BCN_FILTER",			/* 19 */
> -	"RTT",				/* 20 */
> -	"RATECTRL",			/* 21 */
> -	"WOW",				/* 22 */
> -	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
> -	"SPECULATIVE_PS_POLL",		/* 24 */
> -	"SCAN_SCH",			/* 25 */
> -	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
> -	"WLAN_SCAN_OFFLOAD",		/* 27 */
> -	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
> -	"ADVANCE_TDLS",			/* 29 */
> -	"BATCH_SCAN",			/* 30 */
> -	"FW_IN_TX_PATH",		/* 31 */
> -	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
> -	"CH_SWITCH_V1",			/* 33 */
> -	"HT40_OBSS_SCAN",		/* 34 */
> -	"UPDATE_CHANNEL_LIST",		/* 35 */
> -	"WLAN_MCADDR_FLT",		/* 36 */
> -	"WLAN_CH144",			/* 37 */
> -	"NAN",				/* 38 */
> -	"TDLS_SCAN_COEXISTENCE",	/* 39 */
> -	"LINK_LAYER_STATS_MEAS",	/* 40 */
> -	"MU_MIMO",			/* 41 */
> -	"EXTENDED_SCAN",		/* 42 */
> -	"DYNAMIC_WMM_PS",		/* 43 */
> -	"MAC_SPOOFED_SCAN",		/* 44 */
> -	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
> -	"DISA",				/* 46 */
> -	"FW_STATS",			/* 47 */
> -	"WPS_PRBRSP_TMPL",		/* 48 */
> -	"BCN_IE_FLT_DELTA",		/* 49 */
> -	"TDLS_OFF_CHANNEL",		/* 51 */
> -	"RTT3",				/* 52 */
> -	"MGMT_FRAME_LOGGING",		/* 53 */
> -	"ENHANCED_TXBD_COMPLETION",	/* 54 */
> -	"LOGGING_ENHANCEMENT",		/* 55 */
> -	"EXT_SCAN_ENHANCED",		/* 56 */
> -	"MEMORY_DUMP_SUPPORTED",	/* 57 */
> -	"PER_PKT_STATS_SUPPORTED",	/* 58 */
> -	"EXT_LL_STAT",			/* 60 */
> -	"WIFI_CONFIG",			/* 61 */
> -	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
> +	[0]  = "MCC",
> +	[1]  = "P2P",
> +	[2]  = "DOT11AC",
> +	[3]  = "SLM_SESSIONIZATION",
> +	[4]  = "DOT11AC_OPMODE",
> +	[5]  = "SAP32STA",
> +	[6]  = "TDLS",
> +	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
> +	[8]  = "WLANACTIVE_OFFLOAD",
> +	[9]  = "BEACON_OFFLOAD",
> +	[10] = "SCAN_OFFLOAD",
> +	[11] = "ROAM_OFFLOAD",
> +	[12] = "BCN_MISS_OFFLOAD",
> +	[13] = "STA_POWERSAVE",
> +	[14] = "STA_ADVANCED_PWRSAVE",
> +	[15] = "AP_UAPSD",
> +	[16] = "AP_DFS",
> +	[17] = "BLOCKACK",
> +	[18] = "PHY_ERR",
> +	[19] = "BCN_FILTER",
> +	[20] = "RTT",
> +	[21] = "RATECTRL",
> +	[22] = "WOW",
> +	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
> +	[24] = "SPECULATIVE_PS_POLL",
> +	[25] = "SCAN_SCH",
> +	[26] = "IBSS_HEARTBEAT_OFFLOAD",
> +	[27] = "WLAN_SCAN_OFFLOAD",
> +	[28] = "WLAN_PERIODIC_TX_PTRN",
> +	[29] = "ADVANCE_TDLS",
> +	[30] = "BATCH_SCAN",
> +	[31] = "FW_IN_TX_PATH",
> +	[32] = "EXTENDED_NSOFFLOAD_SLOT",
> +	[33] = "CH_SWITCH_V1",
> +	[34] = "HT40_OBSS_SCAN",
> +	[35] = "UPDATE_CHANNEL_LIST",
> +	[36] = "WLAN_MCADDR_FLT",
> +	[37] = "WLAN_CH144",
> +	[38] = "NAN",
> +	[39] = "TDLS_SCAN_COEXISTENCE",
> +	[40] = "LINK_LAYER_STATS_MEAS",
> +	[41] = "MU_MIMO",
> +	[42] = "EXTENDED_SCAN",
> +	[43] = "DYNAMIC_WMM_PS",
> +	[44] = "MAC_SPOOFED_SCAN",
> +	[45] = "BMU_ERROR_GENERIC_RECOVERY",
> +	[46] = "DISA",
> +	[47] = "FW_STATS",
> +	[48] = "WPS_PRBRSP_TMPL",
> +	[49] = "BCN_IE_FLT_DELTA",
> +	[51] = "TDLS_OFF_CHANNEL",
> +	[52] = "RTT3",
> +	[53] = "MGMT_FRAME_LOGGING",
> +	[54] = "ENHANCED_TXBD_COMPLETION",
> +	[55] = "LOGGING_ENHANCEMENT",
> +	[56] = "EXT_SCAN_ENHANCED",
> +	[57] = "MEMORY_DUMP_SUPPORTED",
> +	[58] = "PER_PKT_STATS_SUPPORTED",
> +	[60] = "EXT_LL_STAT",
> +	[61] = "WIFI_CONFIG",
> +	[62] = "ANTENNA_DIVERSITY_SELECTION",
>   };
>   
>   static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)

I know there has been much discussion on this series. For this specific 
patch this would be a great change if you use the actual enumerations 
from enum place_holder_in_cap_bitmap as the index values,
i.e.
  [MCC] = "MCC",
  etc.

So a v2 for this patch would be appreciated

Re: [PATCH 19/22] wnc36xx: Replace comments with C99 initializers

[Jeff Johnson]

On 3/26/2022 9:59 AM, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/ath/wcn36xx/main.c | 122 ++++++++++++------------
>   1 file changed, 61 insertions(+), 61 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index 95ea7d040d8c..0fed64bd37b4 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -193,67 +193,67 @@ static inline u8 get_sta_index(struct ieee80211_vif *vif,
>   }
>   
>   static const char * const wcn36xx_caps_names[] = {
> -	"MCC",				/* 0 */
> -	"P2P",				/* 1 */
> -	"DOT11AC",			/* 2 */
> -	"SLM_SESSIONIZATION",		/* 3 */
> -	"DOT11AC_OPMODE",		/* 4 */
> -	"SAP32STA",			/* 5 */
> -	"TDLS",				/* 6 */
> -	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
> -	"WLANACTIVE_OFFLOAD",		/* 8 */
> -	"BEACON_OFFLOAD",		/* 9 */
> -	"SCAN_OFFLOAD",			/* 10 */
> -	"ROAM_OFFLOAD",			/* 11 */
> -	"BCN_MISS_OFFLOAD",		/* 12 */
> -	"STA_POWERSAVE",		/* 13 */
> -	"STA_ADVANCED_PWRSAVE",		/* 14 */
> -	"AP_UAPSD",			/* 15 */
> -	"AP_DFS",			/* 16 */
> -	"BLOCKACK",			/* 17 */
> -	"PHY_ERR",			/* 18 */
> -	"BCN_FILTER",			/* 19 */
> -	"RTT",				/* 20 */
> -	"RATECTRL",			/* 21 */
> -	"WOW",				/* 22 */
> -	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
> -	"SPECULATIVE_PS_POLL",		/* 24 */
> -	"SCAN_SCH",			/* 25 */
> -	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
> -	"WLAN_SCAN_OFFLOAD",		/* 27 */
> -	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
> -	"ADVANCE_TDLS",			/* 29 */
> -	"BATCH_SCAN",			/* 30 */
> -	"FW_IN_TX_PATH",		/* 31 */
> -	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
> -	"CH_SWITCH_V1",			/* 33 */
> -	"HT40_OBSS_SCAN",		/* 34 */
> -	"UPDATE_CHANNEL_LIST",		/* 35 */
> -	"WLAN_MCADDR_FLT",		/* 36 */
> -	"WLAN_CH144",			/* 37 */
> -	"NAN",				/* 38 */
> -	"TDLS_SCAN_COEXISTENCE",	/* 39 */
> -	"LINK_LAYER_STATS_MEAS",	/* 40 */
> -	"MU_MIMO",			/* 41 */
> -	"EXTENDED_SCAN",		/* 42 */
> -	"DYNAMIC_WMM_PS",		/* 43 */
> -	"MAC_SPOOFED_SCAN",		/* 44 */
> -	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
> -	"DISA",				/* 46 */
> -	"FW_STATS",			/* 47 */
> -	"WPS_PRBRSP_TMPL",		/* 48 */
> -	"BCN_IE_FLT_DELTA",		/* 49 */
> -	"TDLS_OFF_CHANNEL",		/* 51 */
> -	"RTT3",				/* 52 */
> -	"MGMT_FRAME_LOGGING",		/* 53 */
> -	"ENHANCED_TXBD_COMPLETION",	/* 54 */
> -	"LOGGING_ENHANCEMENT",		/* 55 */
> -	"EXT_SCAN_ENHANCED",		/* 56 */
> -	"MEMORY_DUMP_SUPPORTED",	/* 57 */
> -	"PER_PKT_STATS_SUPPORTED",	/* 58 */
> -	"EXT_LL_STAT",			/* 60 */
> -	"WIFI_CONFIG",			/* 61 */
> -	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
> +	[0]  = "MCC",
> +	[1]  = "P2P",
> +	[2]  = "DOT11AC",
> +	[3]  = "SLM_SESSIONIZATION",
> +	[4]  = "DOT11AC_OPMODE",
> +	[5]  = "SAP32STA",
> +	[6]  = "TDLS",
> +	[7]  = "P2P_GO_NOA_DECOUPLE_INIT_SCAN",
> +	[8]  = "WLANACTIVE_OFFLOAD",
> +	[9]  = "BEACON_OFFLOAD",
> +	[10] = "SCAN_OFFLOAD",
> +	[11] = "ROAM_OFFLOAD",
> +	[12] = "BCN_MISS_OFFLOAD",
> +	[13] = "STA_POWERSAVE",
> +	[14] = "STA_ADVANCED_PWRSAVE",
> +	[15] = "AP_UAPSD",
> +	[16] = "AP_DFS",
> +	[17] = "BLOCKACK",
> +	[18] = "PHY_ERR",
> +	[19] = "BCN_FILTER",
> +	[20] = "RTT",
> +	[21] = "RATECTRL",
> +	[22] = "WOW",
> +	[23] = "WLAN_ROAM_SCAN_OFFLOAD",
> +	[24] = "SPECULATIVE_PS_POLL",
> +	[25] = "SCAN_SCH",
> +	[26] = "IBSS_HEARTBEAT_OFFLOAD",
> +	[27] = "WLAN_SCAN_OFFLOAD",
> +	[28] = "WLAN_PERIODIC_TX_PTRN",
> +	[29] = "ADVANCE_TDLS",
> +	[30] = "BATCH_SCAN",
> +	[31] = "FW_IN_TX_PATH",
> +	[32] = "EXTENDED_NSOFFLOAD_SLOT",
> +	[33] = "CH_SWITCH_V1",
> +	[34] = "HT40_OBSS_SCAN",
> +	[35] = "UPDATE_CHANNEL_LIST",
> +	[36] = "WLAN_MCADDR_FLT",
> +	[37] = "WLAN_CH144",
> +	[38] = "NAN",
> +	[39] = "TDLS_SCAN_COEXISTENCE",
> +	[40] = "LINK_LAYER_STATS_MEAS",
> +	[41] = "MU_MIMO",
> +	[42] = "EXTENDED_SCAN",
> +	[43] = "DYNAMIC_WMM_PS",
> +	[44] = "MAC_SPOOFED_SCAN",
> +	[45] = "BMU_ERROR_GENERIC_RECOVERY",
> +	[46] = "DISA",
> +	[47] = "FW_STATS",
> +	[48] = "WPS_PRBRSP_TMPL",
> +	[49] = "BCN_IE_FLT_DELTA",
> +	[51] = "TDLS_OFF_CHANNEL",
> +	[52] = "RTT3",
> +	[53] = "MGMT_FRAME_LOGGING",
> +	[54] = "ENHANCED_TXBD_COMPLETION",
> +	[55] = "LOGGING_ENHANCEMENT",
> +	[56] = "EXT_SCAN_ENHANCED",
> +	[57] = "MEMORY_DUMP_SUPPORTED",
> +	[58] = "PER_PKT_STATS_SUPPORTED",
> +	[60] = "EXT_LL_STAT",
> +	[61] = "WIFI_CONFIG",
> +	[62] = "ANTENNA_DIVERSITY_SELECTION",
>   };
>   
>   static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)

I know there has been much discussion on this series. For this specific 
patch this would be a great change if you use the actual enumerations 
from enum place_holder_in_cap_bitmap as the index values,
i.e.
  [MCC] = "MCC",
  etc.

So a v2 for this patch would be appreciated

Re: [PATCH 19/22 v2] wcn36xx: Improve readability of wcn36xx_caps_name

[Benjamin Stürz]

Make the array more readable and easier to maintain.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 126 ++++++++++++------------
 1 file changed, 65 insertions(+), 61 deletions(-)

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c
b/drivers/net/wireless/ath/wcn36xx/main.c
index 95ea7d040d8c..ac9465dfae64 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -192,70 +192,74 @@ static inline u8 get_sta_index(struct
ieee80211_vif *vif,
 	       sta_priv->sta_index;
 }

+#define DEFINE(s) [s] = #s
+
 static const char * const wcn36xx_caps_names[] = {
-	"MCC",				/* 0 */
-	"P2P",				/* 1 */
-	"DOT11AC",			/* 2 */
-	"SLM_SESSIONIZATION",		/* 3 */
-	"DOT11AC_OPMODE",		/* 4 */
-	"SAP32STA",			/* 5 */
-	"TDLS",				/* 6 */
-	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
-	"WLANACTIVE_OFFLOAD",		/* 8 */
-	"BEACON_OFFLOAD",		/* 9 */
-	"SCAN_OFFLOAD",			/* 10 */
-	"ROAM_OFFLOAD",			/* 11 */
-	"BCN_MISS_OFFLOAD",		/* 12 */
-	"STA_POWERSAVE",		/* 13 */
-	"STA_ADVANCED_PWRSAVE",		/* 14 */
-	"AP_UAPSD",			/* 15 */
-	"AP_DFS",			/* 16 */
-	"BLOCKACK",			/* 17 */
-	"PHY_ERR",			/* 18 */
-	"BCN_FILTER",			/* 19 */
-	"RTT",				/* 20 */
-	"RATECTRL",			/* 21 */
-	"WOW",				/* 22 */
-	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
-	"SPECULATIVE_PS_POLL",		/* 24 */
-	"SCAN_SCH",			/* 25 */
-	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
-	"WLAN_SCAN_OFFLOAD",		/* 27 */
-	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
-	"ADVANCE_TDLS",			/* 29 */
-	"BATCH_SCAN",			/* 30 */
-	"FW_IN_TX_PATH",		/* 31 */
-	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
-	"CH_SWITCH_V1",			/* 33 */
-	"HT40_OBSS_SCAN",		/* 34 */
-	"UPDATE_CHANNEL_LIST",		/* 35 */
-	"WLAN_MCADDR_FLT",		/* 36 */
-	"WLAN_CH144",			/* 37 */
-	"NAN",				/* 38 */
-	"TDLS_SCAN_COEXISTENCE",	/* 39 */
-	"LINK_LAYER_STATS_MEAS",	/* 40 */
-	"MU_MIMO",			/* 41 */
-	"EXTENDED_SCAN",		/* 42 */
-	"DYNAMIC_WMM_PS",		/* 43 */
-	"MAC_SPOOFED_SCAN",		/* 44 */
-	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
-	"DISA",				/* 46 */
-	"FW_STATS",			/* 47 */
-	"WPS_PRBRSP_TMPL",		/* 48 */
-	"BCN_IE_FLT_DELTA",		/* 49 */
-	"TDLS_OFF_CHANNEL",		/* 51 */
-	"RTT3",				/* 52 */
-	"MGMT_FRAME_LOGGING",		/* 53 */
-	"ENHANCED_TXBD_COMPLETION",	/* 54 */
-	"LOGGING_ENHANCEMENT",		/* 55 */
-	"EXT_SCAN_ENHANCED",		/* 56 */
-	"MEMORY_DUMP_SUPPORTED",	/* 57 */
-	"PER_PKT_STATS_SUPPORTED",	/* 58 */
-	"EXT_LL_STAT",			/* 60 */
-	"WIFI_CONFIG",			/* 61 */
-	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
+	DEFINE(MCC),
+	DEFINE(P2P),
+	DEFINE(DOT11AC),
+	DEFINE(SLM_SESSIONIZATION),
+	DEFINE(DOT11AC_OPMODE),
+	DEFINE(SAP32STA),
+	DEFINE(TDLS),
+	DEFINE(P2P_GO_NOA_DECOUPLE_INIT_SCAN),
+	DEFINE(WLANACTIVE_OFFLOAD),
+	DEFINE(BEACON_OFFLOAD),
+	DEFINE(SCAN_OFFLOAD),
+	DEFINE(ROAM_OFFLOAD),
+	DEFINE(BCN_MISS_OFFLOAD),
+	DEFINE(STA_POWERSAVE),
+	DEFINE(STA_ADVANCED_PWRSAVE),
+	DEFINE(AP_UAPSD),
+	DEFINE(AP_DFS),
+	DEFINE(BLOCKACK),
+	DEFINE(PHY_ERR),
+	DEFINE(BCN_FILTER),
+	DEFINE(RTT),
+	DEFINE(RATECTRL),
+	DEFINE(WOW),
+	DEFINE(WLAN_ROAM_SCAN_OFFLOAD),
+	DEFINE(SPECULATIVE_PS_POLL),
+	DEFINE(SCAN_SCH),
+	DEFINE(IBSS_HEARTBEAT_OFFLOAD),
+	DEFINE(WLAN_SCAN_OFFLOAD),
+	DEFINE(WLAN_PERIODIC_TX_PTRN),
+	DEFINE(ADVANCE_TDLS),
+	DEFINE(BATCH_SCAN),
+	DEFINE(FW_IN_TX_PATH),
+	DEFINE(EXTENDED_NSOFFLOAD_SLOT),
+	DEFINE(CH_SWITCH_V1),
+	DEFINE(HT40_OBSS_SCAN),
+	DEFINE(UPDATE_CHANNEL_LIST),
+	DEFINE(WLAN_MCADDR_FLT),
+	DEFINE(WLAN_CH144),
+	DEFINE(NAN),
+	DEFINE(TDLS_SCAN_COEXISTENCE),
+	DEFINE(LINK_LAYER_STATS_MEAS),
+	DEFINE(MU_MIMO),
+	DEFINE(EXTENDED_SCAN),
+	DEFINE(DYNAMIC_WMM_PS),
+	DEFINE(MAC_SPOOFED_SCAN),
+	DEFINE(BMU_ERROR_GENERIC_RECOVERY),
+	DEFINE(DISA),
+	DEFINE(FW_STATS),
+	DEFINE(WPS_PRBRSP_TMPL),
+	DEFINE(BCN_IE_FLT_DELTA),
+	DEFINE(TDLS_OFF_CHANNEL),
+	DEFINE(RTT3),
+	DEFINE(MGMT_FRAME_LOGGING),
+	DEFINE(ENHANCED_TXBD_COMPLETION),
+	DEFINE(LOGGING_ENHANCEMENT),
+	DEFINE(EXT_SCAN_ENHANCED),
+	DEFINE(MEMORY_DUMP_SUPPORTED),
+	DEFINE(PER_PKT_STATS_SUPPORTED),
+	DEFINE(EXT_LL_STAT),
+	DEFINE(WIFI_CONFIG),
+	DEFINE(ANTENNA_DIVERSITY_SELECTION),
 };

+#undef DEFINE
+
 static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
 {
 	if (x >= ARRAY_SIZE(wcn36xx_caps_names))
-- 
2.35.1

Re: [PATCH 19/22 v2] wcn36xx: Improve readability of wcn36xx_caps_name

[Jeff Johnson]

(apologies for top-posting)
When you submit new patches you should not do so as a reply, but instead 
as a new thread with a new version number.

And since multiple folks have suggested that you submit on a 
per-subsystem basis I suggest that you re-send this as a singleton just 
to wcn36xx@lists.infradead.org and linux-wireless@vger.kernel.org along 
with the associated maintainers.

So I believe [PATCH v3] wcn36xx:... would be the correct subject, but 
I'm sure Kalle will let us know otherwise

On 3/28/2022 11:38 AM, Benjamin Stürz wrote:
> Make the array more readable and easier to maintain.
> 

Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>

> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/ath/wcn36xx/main.c | 126 ++++++++++++------------
>   1 file changed, 65 insertions(+), 61 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c
> b/drivers/net/wireless/ath/wcn36xx/main.c
> index 95ea7d040d8c..ac9465dfae64 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -192,70 +192,74 @@ static inline u8 get_sta_index(struct
> ieee80211_vif *vif,
>   	       sta_priv->sta_index;
>   }
> 

to be safe you may want an #undef here

> +#define DEFINE(s) [s] = #s
> +
>   static const char * const wcn36xx_caps_names[] = {
> -	"MCC",				/* 0 */
> -	"P2P",				/* 1 */
> -	"DOT11AC",			/* 2 */
> -	"SLM_SESSIONIZATION",		/* 3 */
> -	"DOT11AC_OPMODE",		/* 4 */
> -	"SAP32STA",			/* 5 */
> -	"TDLS",				/* 6 */
> -	"P2P_GO_NOA_DECOUPLE_INIT_SCAN",/* 7 */
> -	"WLANACTIVE_OFFLOAD",		/* 8 */
> -	"BEACON_OFFLOAD",		/* 9 */
> -	"SCAN_OFFLOAD",			/* 10 */
> -	"ROAM_OFFLOAD",			/* 11 */
> -	"BCN_MISS_OFFLOAD",		/* 12 */
> -	"STA_POWERSAVE",		/* 13 */
> -	"STA_ADVANCED_PWRSAVE",		/* 14 */
> -	"AP_UAPSD",			/* 15 */
> -	"AP_DFS",			/* 16 */
> -	"BLOCKACK",			/* 17 */
> -	"PHY_ERR",			/* 18 */
> -	"BCN_FILTER",			/* 19 */
> -	"RTT",				/* 20 */
> -	"RATECTRL",			/* 21 */
> -	"WOW",				/* 22 */
> -	"WLAN_ROAM_SCAN_OFFLOAD",	/* 23 */
> -	"SPECULATIVE_PS_POLL",		/* 24 */
> -	"SCAN_SCH",			/* 25 */
> -	"IBSS_HEARTBEAT_OFFLOAD",	/* 26 */
> -	"WLAN_SCAN_OFFLOAD",		/* 27 */
> -	"WLAN_PERIODIC_TX_PTRN",	/* 28 */
> -	"ADVANCE_TDLS",			/* 29 */
> -	"BATCH_SCAN",			/* 30 */
> -	"FW_IN_TX_PATH",		/* 31 */
> -	"EXTENDED_NSOFFLOAD_SLOT",	/* 32 */
> -	"CH_SWITCH_V1",			/* 33 */
> -	"HT40_OBSS_SCAN",		/* 34 */
> -	"UPDATE_CHANNEL_LIST",		/* 35 */
> -	"WLAN_MCADDR_FLT",		/* 36 */
> -	"WLAN_CH144",			/* 37 */
> -	"NAN",				/* 38 */
> -	"TDLS_SCAN_COEXISTENCE",	/* 39 */
> -	"LINK_LAYER_STATS_MEAS",	/* 40 */
> -	"MU_MIMO",			/* 41 */
> -	"EXTENDED_SCAN",		/* 42 */
> -	"DYNAMIC_WMM_PS",		/* 43 */
> -	"MAC_SPOOFED_SCAN",		/* 44 */
> -	"BMU_ERROR_GENERIC_RECOVERY",	/* 45 */
> -	"DISA",				/* 46 */
> -	"FW_STATS",			/* 47 */
> -	"WPS_PRBRSP_TMPL",		/* 48 */
> -	"BCN_IE_FLT_DELTA",		/* 49 */
> -	"TDLS_OFF_CHANNEL",		/* 51 */
> -	"RTT3",				/* 52 */
> -	"MGMT_FRAME_LOGGING",		/* 53 */
> -	"ENHANCED_TXBD_COMPLETION",	/* 54 */
> -	"LOGGING_ENHANCEMENT",		/* 55 */
> -	"EXT_SCAN_ENHANCED",		/* 56 */
> -	"MEMORY_DUMP_SUPPORTED",	/* 57 */
> -	"PER_PKT_STATS_SUPPORTED",	/* 58 */
> -	"EXT_LL_STAT",			/* 60 */
> -	"WIFI_CONFIG",			/* 61 */
> -	"ANTENNA_DIVERSITY_SELECTION",	/* 62 */
> +	DEFINE(MCC),
> +	DEFINE(P2P),
> +	DEFINE(DOT11AC),
> +	DEFINE(SLM_SESSIONIZATION),
> +	DEFINE(DOT11AC_OPMODE),
> +	DEFINE(SAP32STA),
> +	DEFINE(TDLS),
> +	DEFINE(P2P_GO_NOA_DECOUPLE_INIT_SCAN),
> +	DEFINE(WLANACTIVE_OFFLOAD),
> +	DEFINE(BEACON_OFFLOAD),
> +	DEFINE(SCAN_OFFLOAD),
> +	DEFINE(ROAM_OFFLOAD),
> +	DEFINE(BCN_MISS_OFFLOAD),
> +	DEFINE(STA_POWERSAVE),
> +	DEFINE(STA_ADVANCED_PWRSAVE),
> +	DEFINE(AP_UAPSD),
> +	DEFINE(AP_DFS),
> +	DEFINE(BLOCKACK),
> +	DEFINE(PHY_ERR),
> +	DEFINE(BCN_FILTER),
> +	DEFINE(RTT),
> +	DEFINE(RATECTRL),
> +	DEFINE(WOW),
> +	DEFINE(WLAN_ROAM_SCAN_OFFLOAD),
> +	DEFINE(SPECULATIVE_PS_POLL),
> +	DEFINE(SCAN_SCH),
> +	DEFINE(IBSS_HEARTBEAT_OFFLOAD),
> +	DEFINE(WLAN_SCAN_OFFLOAD),
> +	DEFINE(WLAN_PERIODIC_TX_PTRN),
> +	DEFINE(ADVANCE_TDLS),
> +	DEFINE(BATCH_SCAN),
> +	DEFINE(FW_IN_TX_PATH),
> +	DEFINE(EXTENDED_NSOFFLOAD_SLOT),
> +	DEFINE(CH_SWITCH_V1),
> +	DEFINE(HT40_OBSS_SCAN),
> +	DEFINE(UPDATE_CHANNEL_LIST),
> +	DEFINE(WLAN_MCADDR_FLT),
> +	DEFINE(WLAN_CH144),
> +	DEFINE(NAN),
> +	DEFINE(TDLS_SCAN_COEXISTENCE),
> +	DEFINE(LINK_LAYER_STATS_MEAS),
> +	DEFINE(MU_MIMO),
> +	DEFINE(EXTENDED_SCAN),
> +	DEFINE(DYNAMIC_WMM_PS),
> +	DEFINE(MAC_SPOOFED_SCAN),
> +	DEFINE(BMU_ERROR_GENERIC_RECOVERY),
> +	DEFINE(DISA),
> +	DEFINE(FW_STATS),
> +	DEFINE(WPS_PRBRSP_TMPL),
> +	DEFINE(BCN_IE_FLT_DELTA),
> +	DEFINE(TDLS_OFF_CHANNEL),
> +	DEFINE(RTT3),
> +	DEFINE(MGMT_FRAME_LOGGING),
> +	DEFINE(ENHANCED_TXBD_COMPLETION),
> +	DEFINE(LOGGING_ENHANCEMENT),
> +	DEFINE(EXT_SCAN_ENHANCED),
> +	DEFINE(MEMORY_DUMP_SUPPORTED),
> +	DEFINE(PER_PKT_STATS_SUPPORTED),
> +	DEFINE(EXT_LL_STAT),
> +	DEFINE(WIFI_CONFIG),
> +	DEFINE(ANTENNA_DIVERSITY_SELECTION),
>   };
> 
> +#undef DEFINE
> +
>   static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)
>   {
>   	if (x >= ARRAY_SIZE(wcn36xx_caps_names))

Re: [PATCH 19/22 v2] wcn36xx: Improve readability of wcn36xx_caps_name

[Kalle Valo]

Jeff Johnson <quic_jjohnson@quicinc.com> writes:

> (apologies for top-posting)
> When you submit new patches you should not do so as a reply, but
> instead as a new thread with a new version number.
>
> And since multiple folks have suggested that you submit on a
> per-subsystem basis I suggest that you re-send this as a singleton
> just to wcn36xx@lists.infradead.org and linux-wireless@vger.kernel.org
> along with the associated maintainers.
>
> So I believe [PATCH v3] wcn36xx:... would be the correct subject, but
> I'm sure Kalle will let us know otherwise

You are correct. Also I strongly recommend using git send-email instead
of Mozilla. Patch handling is automated using patchwork and git, so
submitting patches manually is error prone. See our wiki for more:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#format_issues

Also I recommend reading the whole wiki page in detail, that way common
errors can be avoided and we all can save time :)

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 19/22 v2] wcn36xx: Improve readability of wcn36xx_caps_name

[Kalle Valo]

Kalle Valo <kvalo@kernel.org> writes:

> Jeff Johnson <quic_jjohnson@quicinc.com> writes:
>
>> (apologies for top-posting)
>> When you submit new patches you should not do so as a reply, but
>> instead as a new thread with a new version number.
>>
>> And since multiple folks have suggested that you submit on a
>> per-subsystem basis I suggest that you re-send this as a singleton
>> just to wcn36xx@lists.infradead.org and linux-wireless@vger.kernel.org
>> along with the associated maintainers.
>>
>> So I believe [PATCH v3] wcn36xx:... would be the correct subject, but
>> I'm sure Kalle will let us know otherwise
>
> You are correct. Also I strongly recommend using git send-email instead
> of Mozilla. Patch handling is automated using patchwork and git, so
> submitting patches manually is error prone.

Yeah, our patchwork didn't even detect this patch. But v3 is visible and
is on my queue:

https://patchwork.kernel.org/project/linux-wireless/patch/20220328212912.283393-1-benni@stuerz.xyz/

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH 20/22] wireless: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ray_cs.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..dd11018b956c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
 #define MAXDATA (PAGE_SIZE - 80)
 
 static const char *card_status[] = {
-	"Card inserted - uninitialized",	/* 0 */
-	"Card not downloaded",			/* 1 */
-	"Waiting for download parameters",	/* 2 */
-	"Card doing acquisition",		/* 3 */
-	"Acquisition complete",			/* 4 */
-	"Authentication complete",		/* 5 */
-	"Association complete",			/* 6 */
-	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
-	"Card init error",			/* 11 */
-	"Download parameters error",		/* 12 */
-	"???",					/* 13 */
-	"Acquisition failed",			/* 14 */
-	"Authentication refused",		/* 15 */
-	"Association failed"			/* 16 */
+	[0]  = "Card inserted - uninitialized",
+	[1]  = "Card not downloaded",
+	[2]  = "Waiting for download parameters",
+	[3]  = "Card doing acquisition",
+	[4]  = "Acquisition complete",
+	[5]  = "Authentication complete",
+	[6]  = "Association complete",
+	[7]  = "???",
+	[8]  = "???",
+	[9]  = "???",
+	[10] = "???",
+	[11] = "Card init error",
+	[12] = "Download parameters error",
+	[13] = "???",
+	[14] = "Acquisition failed",
+	[15] = "Authentication refused",
+	[16] = "Association failed"
 };
 
 static const char *nettype[] = { "Adhoc", "Infra " };
-- 
2.35.1

[PATCH 20/22] wireless: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ray_cs.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..dd11018b956c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
 #define MAXDATA (PAGE_SIZE - 80)
 
 static const char *card_status[] = {
-	"Card inserted - uninitialized",	/* 0 */
-	"Card not downloaded",			/* 1 */
-	"Waiting for download parameters",	/* 2 */
-	"Card doing acquisition",		/* 3 */
-	"Acquisition complete",			/* 4 */
-	"Authentication complete",		/* 5 */
-	"Association complete",			/* 6 */
-	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
-	"Card init error",			/* 11 */
-	"Download parameters error",		/* 12 */
-	"???",					/* 13 */
-	"Acquisition failed",			/* 14 */
-	"Authentication refused",		/* 15 */
-	"Association failed"			/* 16 */
+	[0]  = "Card inserted - uninitialized",
+	[1]  = "Card not downloaded",
+	[2]  = "Waiting for download parameters",
+	[3]  = "Card doing acquisition",
+	[4]  = "Acquisition complete",
+	[5]  = "Authentication complete",
+	[6]  = "Association complete",
+	[7]  = "???",
+	[8]  = "???",
+	[9]  = "???",
+	[10] = "???",
+	[11] = "Card init error",
+	[12] = "Download parameters error",
+	[13] = "???",
+	[14] = "Acquisition failed",
+	[15] = "Authentication refused",
+	[16] = "Association failed"
 };
 
 static const char *nettype[] = { "Adhoc", "Infra " };
-- 
2.35.1

[PATCH 20/22] wireless: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ray_cs.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..dd11018b956c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
 #define MAXDATA (PAGE_SIZE - 80)
 
 static const char *card_status[] = {
-	"Card inserted - uninitialized",	/* 0 */
-	"Card not downloaded",			/* 1 */
-	"Waiting for download parameters",	/* 2 */
-	"Card doing acquisition",		/* 3 */
-	"Acquisition complete",			/* 4 */
-	"Authentication complete",		/* 5 */
-	"Association complete",			/* 6 */
-	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
-	"Card init error",			/* 11 */
-	"Download parameters error",		/* 12 */
-	"???",					/* 13 */
-	"Acquisition failed",			/* 14 */
-	"Authentication refused",		/* 15 */
-	"Association failed"			/* 16 */
+	[0]  = "Card inserted - uninitialized",
+	[1]  = "Card not downloaded",
+	[2]  = "Waiting for download parameters",
+	[3]  = "Card doing acquisition",
+	[4]  = "Acquisition complete",
+	[5]  = "Authentication complete",
+	[6]  = "Association complete",
+	[7]  = "???",
+	[8]  = "???",
+	[9]  = "???",
+	[10] = "???",
+	[11] = "Card init error",
+	[12] = "Download parameters error",
+	[13] = "???",
+	[14] = "Acquisition failed",
+	[15] = "Authentication refused",
+	[16] = "Association failed"
 };
 
 static const char *nettype[] = { "Adhoc", "Infra " };
-- 
2.35.1

Re: [PATCH 20/22] wireless: Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

The title prefix should be "ray_cs: ".

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220326165909.506926-20-benni@stuerz.xyz/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 20/22] wireless: Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

The title prefix should be "ray_cs: ".

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220326165909.506926-20-benni@stuerz.xyz/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 20/22] wireless: Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> wrote:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

The title prefix should be "ray_cs: ".

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220326165909.506926-20-benni@stuerz.xyz/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH 20/22 v2] ray_cs: Replace comments with C99 initializers

[Benjamin Stürz]

Replace comments with C99's designated initializers.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ray_cs.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..dd11018b956c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
 #define MAXDATA (PAGE_SIZE - 80)

 static const char *card_status[] = {
-	"Card inserted - uninitialized",	/* 0 */
-	"Card not downloaded",			/* 1 */
-	"Waiting for download parameters",	/* 2 */
-	"Card doing acquisition",		/* 3 */
-	"Acquisition complete",			/* 4 */
-	"Authentication complete",		/* 5 */
-	"Association complete",			/* 6 */
-	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
-	"Card init error",			/* 11 */
-	"Download parameters error",		/* 12 */
-	"???",					/* 13 */
-	"Acquisition failed",			/* 14 */
-	"Authentication refused",		/* 15 */
-	"Association failed"			/* 16 */
+	[0]  = "Card inserted - uninitialized",
+	[1]  = "Card not downloaded",
+	[2]  = "Waiting for download parameters",
+	[3]  = "Card doing acquisition",
+	[4]  = "Acquisition complete",
+	[5]  = "Authentication complete",
+	[6]  = "Association complete",
+	[7]  = "???",
+	[8]  = "???",
+	[9]  = "???",
+	[10] = "???",
+	[11] = "Card init error",
+	[12] = "Download parameters error",
+	[13] = "???",
+	[14] = "Acquisition failed",
+	[15] = "Authentication refused",
+	[16] = "Association failed"
 };

 static const char *nettype[] = { "Adhoc", "Infra " };
-- 
2.35.1

Re: [PATCH 20/22 v2] ray_cs: Replace comments with C99 initializers

[Joe Perches]

On Mon, 2022-03-28 at 20:21 +0200, Benjamin Stürz wrote:
> Replace comments with C99's designated initializers.
[]
> diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
[]
> @@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
>  #define MAXDATA (PAGE_SIZE - 80)
> 
>  static const char *card_status[] = {
> -	"Card inserted - uninitialized",	/* 0 */
> -	"Card not downloaded",			/* 1 */
> -	"Waiting for download parameters",	/* 2 */
> -	"Card doing acquisition",		/* 3 */
> -	"Acquisition complete",			/* 4 */
> -	"Authentication complete",		/* 5 */
> -	"Association complete",			/* 6 */
> -	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
> -	"Card init error",			/* 11 */
> -	"Download parameters error",		/* 12 */
> -	"???",					/* 13 */
> -	"Acquisition failed",			/* 14 */
> -	"Authentication refused",		/* 15 */
> -	"Association failed"			/* 16 */
> +	[0]  = "Card inserted - uninitialized",

If you are going to do this at all, please use the #defines
in drivers/net/wireless/rayctl.h

	[CARD_INSERTED] = "Card inserted - uninitialized",
	[CARD_AWAITING_PARAM] = "Card not downloaded",

etc...

$ git grep -w -P 'CARD_\w+' drivers/net/wireless/rayctl.h
drivers/net/wireless/rayctl.h:#define CARD_INSERTED       (0)
drivers/net/wireless/rayctl.h:#define CARD_AWAITING_PARAM (1)
drivers/net/wireless/rayctl.h:#define CARD_INIT_ERROR     (11)
drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM       (2)
drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM_ERROR (12)
drivers/net/wireless/rayctl.h:#define CARD_DOING_ACQ      (3)
drivers/net/wireless/rayctl.h:#define CARD_ACQ_COMPLETE   (4)
drivers/net/wireless/rayctl.h:#define CARD_ACQ_FAILED     (14)
drivers/net/wireless/rayctl.h:#define CARD_AUTH_COMPLETE  (5)
drivers/net/wireless/rayctl.h:#define CARD_AUTH_REFUSED   (15)
drivers/net/wireless/rayctl.h:#define CARD_ASSOC_COMPLETE (6)
drivers/net/wireless/rayctl.h:#define CARD_ASSOC_FAILED   (16)

> +	[1]  = "Card not downloaded",
> +	[2]  = "Waiting for download parameters",
> +	[3]  = "Card doing acquisition",
> +	[4]  = "Acquisition complete",
> +	[5]  = "Authentication complete",
> +	[6]  = "Association complete",
> +	[7]  = "???",
> +	[8]  = "???",
> +	[9]  = "???",
> +	[10] = "???",
> +	[11] = "Card init error",
> +	[12] = "Download parameters error",
> +	[13] = "???",
> +	[14] = "Acquisition failed",
> +	[15] = "Authentication refused",
> +	[16] = "Association failed"
>  };
> 
>  static const char *nettype[] = { "Adhoc", "Infra " };

[PATCH 20/22 v3] ray_cs: Improve card_status[]

[Benjamin Stürz]

On 28.03.22 21:23, Joe Perches wrote:
> On Mon, 2022-03-28 at 20:21 +0200, Benjamin Stürz wrote:
>> Replace comments with C99's designated initializers.
> []
>> diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
> []
>> @@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
>>  #define MAXDATA (PAGE_SIZE - 80)
>>
>>  static const char *card_status[] = {
>> -	"Card inserted - uninitialized",	/* 0 */
>> -	"Card not downloaded",			/* 1 */
>> -	"Waiting for download parameters",	/* 2 */
>> -	"Card doing acquisition",		/* 3 */
>> -	"Acquisition complete",			/* 4 */
>> -	"Authentication complete",		/* 5 */
>> -	"Association complete",			/* 6 */
>> -	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
>> -	"Card init error",			/* 11 */
>> -	"Download parameters error",		/* 12 */
>> -	"???",					/* 13 */
>> -	"Acquisition failed",			/* 14 */
>> -	"Authentication refused",		/* 15 */
>> -	"Association failed"			/* 16 */
>> +	[0]  = "Card inserted - uninitialized",
> 
> If you are going to do this at all, please use the #defines
> in drivers/net/wireless/rayctl.h
> 
> 	[CARD_INSERTED] = "Card inserted - uninitialized",
> 	[CARD_AWAITING_PARAM] = "Card not downloaded",
> 
> etc...
> 
> $ git grep -w -P 'CARD_\w+' drivers/net/wireless/rayctl.h
> drivers/net/wireless/rayctl.h:#define CARD_INSERTED       (0)
> drivers/net/wireless/rayctl.h:#define CARD_AWAITING_PARAM (1)
> drivers/net/wireless/rayctl.h:#define CARD_INIT_ERROR     (11)
> drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM       (2)
> drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM_ERROR (12)
> drivers/net/wireless/rayctl.h:#define CARD_DOING_ACQ      (3)
> drivers/net/wireless/rayctl.h:#define CARD_ACQ_COMPLETE   (4)
> drivers/net/wireless/rayctl.h:#define CARD_ACQ_FAILED     (14)
> drivers/net/wireless/rayctl.h:#define CARD_AUTH_COMPLETE  (5)
> drivers/net/wireless/rayctl.h:#define CARD_AUTH_REFUSED   (15)
> drivers/net/wireless/rayctl.h:#define CARD_ASSOC_COMPLETE (6)
> drivers/net/wireless/rayctl.h:#define CARD_ASSOC_FAILED   (16)
> 
>> +	[1]  = "Card not downloaded",
>> +	[2]  = "Waiting for download parameters",
>> +	[3]  = "Card doing acquisition",
>> +	[4]  = "Acquisition complete",
>> +	[5]  = "Authentication complete",
>> +	[6]  = "Association complete",
>> +	[7]  = "???",
>> +	[8]  = "???",
>> +	[9]  = "???",
>> +	[10] = "???",
>> +	[11] = "Card init error",
>> +	[12] = "Download parameters error",
>> +	[13] = "???",
>> +	[14] = "Acquisition failed",
>> +	[15] = "Authentication refused",
>> +	[16] = "Association failed"
>>  };
>>
>>  static const char *nettype[] = { "Adhoc", "Infra " };
> 
> 


- Make card_status[] const, because it should never be modified
- Replace comments with C99's designated initializers to improve
  readability and maintainability

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/ray_cs.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 87e98ab068ed..07f36aaefbde 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2528,21 +2528,24 @@ static void clear_interrupt(ray_dev_t *local)
 #ifdef CONFIG_PROC_FS
 #define MAXDATA (PAGE_SIZE - 80)

-static const char *card_status[] = {
-	"Card inserted - uninitialized",	/* 0 */
-	"Card not downloaded",			/* 1 */
-	"Waiting for download parameters",	/* 2 */
-	"Card doing acquisition",		/* 3 */
-	"Acquisition complete",			/* 4 */
-	"Authentication complete",		/* 5 */
-	"Association complete",			/* 6 */
-	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
-	"Card init error",			/* 11 */
-	"Download parameters error",		/* 12 */
-	"???",					/* 13 */
-	"Acquisition failed",			/* 14 */
-	"Authentication refused",		/* 15 */
-	"Association failed"			/* 16 */
+static const char * const card_status[] = {
+	[CARD_INSERTED]		= "Card inserted - uninitialized",
+	[CARD_AWAITING_PARAM]	= "Card not downloaded",
+	[CARD_DL_PARAM]		= "Waiting for download parameters",
+	[CARD_DOING_ACQ]	= "Card doing acquisition",
+	[CARD_ACQ_COMPLETE]	= "Acquisition complete",
+	[CARD_AUTH_COMPLETE]	= "Authentication complete",
+	[CARD_ASSOC_COMPLETE]	= "Association complete",
+	[7]			= "???",
+	[8]			= "???",
+	[9]			= "???",
+	[10]			= "???",
+	[CARD_INIT_ERROR]	= "Card init error",
+	[CARD_DL_PARAM_ERROR]	= "Download parameters error",
+	[13]			= "???",
+	[CARD_ACQ_FAILED]	= "Acquisition failed",
+	[CARD_AUTH_REFUSED]	= "Authentication refused",
+	[CARD_ASSOC_FAILED]	= "Association failed"
 };

 static const char *nettype[] = { "Adhoc", "Infra " };
-- 
2.35.1

Re: [PATCH 20/22 v3] ray_cs: Improve card_status[]

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> wrote:

> On 28.03.22 21:23, Joe Perches wrote:
> > On Mon, 2022-03-28 at 20:21 +0200, Benjamin Stürz wrote:
> >> Replace comments with C99's designated initializers.
> > []
> >> diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
> > []
> >> @@ -2529,20 +2529,23 @@ static void clear_interrupt(ray_dev_t *local)
> >>  #define MAXDATA (PAGE_SIZE - 80)
> >>
> >>  static const char *card_status[] = {
> >> -	"Card inserted - uninitialized",	/* 0 */
> >> -	"Card not downloaded",			/* 1 */
> >> -	"Waiting for download parameters",	/* 2 */
> >> -	"Card doing acquisition",		/* 3 */
> >> -	"Acquisition complete",			/* 4 */
> >> -	"Authentication complete",		/* 5 */
> >> -	"Association complete",			/* 6 */
> >> -	"???", "???", "???", "???",		/* 7 8 9 10 undefined */
> >> -	"Card init error",			/* 11 */
> >> -	"Download parameters error",		/* 12 */
> >> -	"???",					/* 13 */
> >> -	"Acquisition failed",			/* 14 */
> >> -	"Authentication refused",		/* 15 */
> >> -	"Association failed"			/* 16 */
> >> +	[0]  = "Card inserted - uninitialized",
> > 
> > If you are going to do this at all, please use the #defines
> > in drivers/net/wireless/rayctl.h
> > 
> > 	[CARD_INSERTED] = "Card inserted - uninitialized",
> > 	[CARD_AWAITING_PARAM] = "Card not downloaded",
> > 
> > etc...
> > 
> > $ git grep -w -P 'CARD_\w+' drivers/net/wireless/rayctl.h
> > drivers/net/wireless/rayctl.h:#define CARD_INSERTED       (0)
> > drivers/net/wireless/rayctl.h:#define CARD_AWAITING_PARAM (1)
> > drivers/net/wireless/rayctl.h:#define CARD_INIT_ERROR     (11)
> > drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM       (2)
> > drivers/net/wireless/rayctl.h:#define CARD_DL_PARAM_ERROR (12)
> > drivers/net/wireless/rayctl.h:#define CARD_DOING_ACQ      (3)
> > drivers/net/wireless/rayctl.h:#define CARD_ACQ_COMPLETE   (4)
> > drivers/net/wireless/rayctl.h:#define CARD_ACQ_FAILED     (14)
> > drivers/net/wireless/rayctl.h:#define CARD_AUTH_COMPLETE  (5)
> > drivers/net/wireless/rayctl.h:#define CARD_AUTH_REFUSED   (15)
> > drivers/net/wireless/rayctl.h:#define CARD_ASSOC_COMPLETE (6)
> > drivers/net/wireless/rayctl.h:#define CARD_ASSOC_FAILED   (16)
> > 
> >> +	[1]  = "Card not downloaded",
> >> +	[2]  = "Waiting for download parameters",
> >> +	[3]  = "Card doing acquisition",
> >> +	[4]  = "Acquisition complete",
> >> +	[5]  = "Authentication complete",
> >> +	[6]  = "Association complete",
> >> +	[7]  = "???",
> >> +	[8]  = "???",
> >> +	[9]  = "???",
> >> +	[10] = "???",
> >> +	[11] = "Card init error",
> >> +	[12] = "Download parameters error",
> >> +	[13] = "???",
> >> +	[14] = "Acquisition failed",
> >> +	[15] = "Authentication refused",
> >> +	[16] = "Association failed"
> >>  };
> >>
> >>  static const char *nettype[] = { "Adhoc", "Infra " };
> > 
> > 
> 
> 
> - Make card_status[] const, because it should never be modified
> - Replace comments with C99's designated initializers to improve
>   readability and maintainability
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>

Please don't include the email discussion in the commit log.

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/6cae7be8-0329-7b0f-9a61-695f3d0cceb4@stuerz.xyz/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH 21/22] rtw89: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 684583955511..3c83a0bfb120 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
 };
 
 static const u32 cxtbl[] = {
-	0xffffffff, /* 0 */
-	0xaaaaaaaa, /* 1 */
-	0x55555555, /* 2 */
-	0x66555555, /* 3 */
-	0x66556655, /* 4 */
-	0x5a5a5a5a, /* 5 */
-	0x5a5a5aaa, /* 6 */
-	0xaa5a5a5a, /* 7 */
-	0x6a5a5a5a, /* 8 */
-	0x6a5a5aaa, /* 9 */
-	0x6a5a6a5a, /* 10 */
-	0x6a5a6aaa, /* 11 */
-	0x6afa5afa, /* 12 */
-	0xaaaa5aaa, /* 13 */
-	0xaaffffaa, /* 14 */
-	0xaa5555aa, /* 15 */
-	0xfafafafa, /* 16 */
-	0xffffddff, /* 17 */
-	0xdaffdaff, /* 18 */
-	0xfafadafa  /* 19 */
+	[0]  = 0xffffffff,
+	[1]  = 0xaaaaaaaa,
+	[2]  = 0x55555555,
+	[3]  = 0x66555555,
+	[4]  = 0x66556655,
+	[5]  = 0x5a5a5a5a,
+	[6]  = 0x5a5a5aaa,
+	[7]  = 0xaa5a5a5a,
+	[8]  = 0x6a5a5a5a,
+	[9]  = 0x6a5a5aaa,
+	[10] = 0x6a5a6a5a,
+	[11] = 0x6a5a6aaa,
+	[12] = 0x6afa5afa,
+	[13] = 0xaaaa5aaa,
+	[14] = 0xaaffffaa,
+	[15] = 0xaa5555aa,
+	[16] = 0xfafafafa,
+	[17] = 0xffffddff,
+	[18] = 0xdaffdaff,
+	[19] = 0xfafadafa
 };
 
 struct rtw89_btc_btf_tlv {
-- 
2.35.1

[PATCH 21/22] rtw89: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 684583955511..3c83a0bfb120 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
 };
 
 static const u32 cxtbl[] = {
-	0xffffffff, /* 0 */
-	0xaaaaaaaa, /* 1 */
-	0x55555555, /* 2 */
-	0x66555555, /* 3 */
-	0x66556655, /* 4 */
-	0x5a5a5a5a, /* 5 */
-	0x5a5a5aaa, /* 6 */
-	0xaa5a5a5a, /* 7 */
-	0x6a5a5a5a, /* 8 */
-	0x6a5a5aaa, /* 9 */
-	0x6a5a6a5a, /* 10 */
-	0x6a5a6aaa, /* 11 */
-	0x6afa5afa, /* 12 */
-	0xaaaa5aaa, /* 13 */
-	0xaaffffaa, /* 14 */
-	0xaa5555aa, /* 15 */
-	0xfafafafa, /* 16 */
-	0xffffddff, /* 17 */
-	0xdaffdaff, /* 18 */
-	0xfafadafa  /* 19 */
+	[0]  = 0xffffffff,
+	[1]  = 0xaaaaaaaa,
+	[2]  = 0x55555555,
+	[3]  = 0x66555555,
+	[4]  = 0x66556655,
+	[5]  = 0x5a5a5a5a,
+	[6]  = 0x5a5a5aaa,
+	[7]  = 0xaa5a5a5a,
+	[8]  = 0x6a5a5a5a,
+	[9]  = 0x6a5a5aaa,
+	[10] = 0x6a5a6a5a,
+	[11] = 0x6a5a6aaa,
+	[12] = 0x6afa5afa,
+	[13] = 0xaaaa5aaa,
+	[14] = 0xaaffffaa,
+	[15] = 0xaa5555aa,
+	[16] = 0xfafafafa,
+	[17] = 0xffffddff,
+	[18] = 0xdaffdaff,
+	[19] = 0xfafadafa
 };
 
 struct rtw89_btc_btf_tlv {
-- 
2.35.1

[PATCH 21/22] rtw89: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 684583955511..3c83a0bfb120 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
 };
 
 static const u32 cxtbl[] = {
-	0xffffffff, /* 0 */
-	0xaaaaaaaa, /* 1 */
-	0x55555555, /* 2 */
-	0x66555555, /* 3 */
-	0x66556655, /* 4 */
-	0x5a5a5a5a, /* 5 */
-	0x5a5a5aaa, /* 6 */
-	0xaa5a5a5a, /* 7 */
-	0x6a5a5a5a, /* 8 */
-	0x6a5a5aaa, /* 9 */
-	0x6a5a6a5a, /* 10 */
-	0x6a5a6aaa, /* 11 */
-	0x6afa5afa, /* 12 */
-	0xaaaa5aaa, /* 13 */
-	0xaaffffaa, /* 14 */
-	0xaa5555aa, /* 15 */
-	0xfafafafa, /* 16 */
-	0xffffddff, /* 17 */
-	0xdaffdaff, /* 18 */
-	0xfafadafa  /* 19 */
+	[0]  = 0xffffffff,
+	[1]  = 0xaaaaaaaa,
+	[2]  = 0x55555555,
+	[3]  = 0x66555555,
+	[4]  = 0x66556655,
+	[5]  = 0x5a5a5a5a,
+	[6]  = 0x5a5a5aaa,
+	[7]  = 0xaa5a5a5a,
+	[8]  = 0x6a5a5a5a,
+	[9]  = 0x6a5a5aaa,
+	[10] = 0x6a5a6a5a,
+	[11] = 0x6a5a6aaa,
+	[12] = 0x6afa5afa,
+	[13] = 0xaaaa5aaa,
+	[14] = 0xaaffffaa,
+	[15] = 0xaa5555aa,
+	[16] = 0xfafafafa,
+	[17] = 0xffffddff,
+	[18] = 0xdaffdaff,
+	[19] = 0xfafadafa
 };
 
 struct rtw89_btc_btf_tlv {
-- 
2.35.1

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 11:59, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>   1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> index 684583955511..3c83a0bfb120 100644
> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>   };
>   
>   static const u32 cxtbl[] = {
> -	0xffffffff, /* 0 */
> -	0xaaaaaaaa, /* 1 */
> -	0x55555555, /* 2 */
> -	0x66555555, /* 3 */
> -	0x66556655, /* 4 */
> -	0x5a5a5a5a, /* 5 */
> -	0x5a5a5aaa, /* 6 */
> -	0xaa5a5a5a, /* 7 */
> -	0x6a5a5a5a, /* 8 */
> -	0x6a5a5aaa, /* 9 */
> -	0x6a5a6a5a, /* 10 */
> -	0x6a5a6aaa, /* 11 */
> -	0x6afa5afa, /* 12 */
> -	0xaaaa5aaa, /* 13 */
> -	0xaaffffaa, /* 14 */
> -	0xaa5555aa, /* 15 */
> -	0xfafafafa, /* 16 */
> -	0xffffddff, /* 17 */
> -	0xdaffdaff, /* 18 */
> -	0xfafadafa  /* 19 */
> +	[0]  = 0xffffffff,
> +	[1]  = 0xaaaaaaaa,
> +	[2]  = 0x55555555,
> +	[3]  = 0x66555555,
> +	[4]  = 0x66556655,
> +	[5]  = 0x5a5a5a5a,
> +	[6]  = 0x5a5a5aaa,
> +	[7]  = 0xaa5a5a5a,
> +	[8]  = 0x6a5a5a5a,
> +	[9]  = 0x6a5a5aaa,
> +	[10] = 0x6a5a6a5a,
> +	[11] = 0x6a5a6aaa,
> +	[12] = 0x6afa5afa,
> +	[13] = 0xaaaa5aaa,
> +	[14] = 0xaaffffaa,
> +	[15] = 0xaa5555aa,
> +	[16] = 0xfafafafa,
> +	[17] = 0xffffddff,
> +	[18] = 0xdaffdaff,
> +	[19] = 0xfafadafa
>   };
>   
>   struct rtw89_btc_btf_tlv {


Is this change really necessary? Yes, the entries must be ordered; however, the 
comment carries that information at very few extra characters. To me, this patch 
looks like unneeded source churn. One other concern is that this driver is 
backported to older kernels and older compilers by several distros. Will this 
change require adding extra conditional statements to the source used in these 
applications?

Larry

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 11:59, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>   1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> index 684583955511..3c83a0bfb120 100644
> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>   };
>   
>   static const u32 cxtbl[] = {
> -	0xffffffff, /* 0 */
> -	0xaaaaaaaa, /* 1 */
> -	0x55555555, /* 2 */
> -	0x66555555, /* 3 */
> -	0x66556655, /* 4 */
> -	0x5a5a5a5a, /* 5 */
> -	0x5a5a5aaa, /* 6 */
> -	0xaa5a5a5a, /* 7 */
> -	0x6a5a5a5a, /* 8 */
> -	0x6a5a5aaa, /* 9 */
> -	0x6a5a6a5a, /* 10 */
> -	0x6a5a6aaa, /* 11 */
> -	0x6afa5afa, /* 12 */
> -	0xaaaa5aaa, /* 13 */
> -	0xaaffffaa, /* 14 */
> -	0xaa5555aa, /* 15 */
> -	0xfafafafa, /* 16 */
> -	0xffffddff, /* 17 */
> -	0xdaffdaff, /* 18 */
> -	0xfafadafa  /* 19 */
> +	[0]  = 0xffffffff,
> +	[1]  = 0xaaaaaaaa,
> +	[2]  = 0x55555555,
> +	[3]  = 0x66555555,
> +	[4]  = 0x66556655,
> +	[5]  = 0x5a5a5a5a,
> +	[6]  = 0x5a5a5aaa,
> +	[7]  = 0xaa5a5a5a,
> +	[8]  = 0x6a5a5a5a,
> +	[9]  = 0x6a5a5aaa,
> +	[10] = 0x6a5a6a5a,
> +	[11] = 0x6a5a6aaa,
> +	[12] = 0x6afa5afa,
> +	[13] = 0xaaaa5aaa,
> +	[14] = 0xaaffffaa,
> +	[15] = 0xaa5555aa,
> +	[16] = 0xfafafafa,
> +	[17] = 0xffffddff,
> +	[18] = 0xdaffdaff,
> +	[19] = 0xfafadafa
>   };
>   
>   struct rtw89_btc_btf_tlv {


Is this change really necessary? Yes, the entries must be ordered; however, the 
comment carries that information at very few extra characters. To me, this patch 
looks like unneeded source churn. One other concern is that this driver is 
backported to older kernels and older compilers by several distros. Will this 
change require adding extra conditional statements to the source used in these 
applications?

Larry

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Larry Finger]

On 3/26/22 11:59, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>   1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> index 684583955511..3c83a0bfb120 100644
> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>   };
>   
>   static const u32 cxtbl[] = {
> -	0xffffffff, /* 0 */
> -	0xaaaaaaaa, /* 1 */
> -	0x55555555, /* 2 */
> -	0x66555555, /* 3 */
> -	0x66556655, /* 4 */
> -	0x5a5a5a5a, /* 5 */
> -	0x5a5a5aaa, /* 6 */
> -	0xaa5a5a5a, /* 7 */
> -	0x6a5a5a5a, /* 8 */
> -	0x6a5a5aaa, /* 9 */
> -	0x6a5a6a5a, /* 10 */
> -	0x6a5a6aaa, /* 11 */
> -	0x6afa5afa, /* 12 */
> -	0xaaaa5aaa, /* 13 */
> -	0xaaffffaa, /* 14 */
> -	0xaa5555aa, /* 15 */
> -	0xfafafafa, /* 16 */
> -	0xffffddff, /* 17 */
> -	0xdaffdaff, /* 18 */
> -	0xfafadafa  /* 19 */
> +	[0]  = 0xffffffff,
> +	[1]  = 0xaaaaaaaa,
> +	[2]  = 0x55555555,
> +	[3]  = 0x66555555,
> +	[4]  = 0x66556655,
> +	[5]  = 0x5a5a5a5a,
> +	[6]  = 0x5a5a5aaa,
> +	[7]  = 0xaa5a5a5a,
> +	[8]  = 0x6a5a5a5a,
> +	[9]  = 0x6a5a5aaa,
> +	[10] = 0x6a5a6a5a,
> +	[11] = 0x6a5a6aaa,
> +	[12] = 0x6afa5afa,
> +	[13] = 0xaaaa5aaa,
> +	[14] = 0xaaffffaa,
> +	[15] = 0xaa5555aa,
> +	[16] = 0xfafafafa,
> +	[17] = 0xffffddff,
> +	[18] = 0xdaffdaff,
> +	[19] = 0xfafadafa
>   };
>   
>   struct rtw89_btc_btf_tlv {


Is this change really necessary? Yes, the entries must be ordered; however, the 
comment carries that information at very few extra characters. To me, this patch 
looks like unneeded source churn. One other concern is that this driver is 
backported to older kernels and older compilers by several distros. Will this 
change require adding extra conditional statements to the source used in these 
applications?

Larry

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Kalle Valo]

Larry Finger <Larry.Finger@lwfinger.net> writes:

> On 3/26/22 11:59, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>>   1 file changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
>> index 684583955511..3c83a0bfb120 100644
>> --- a/drivers/net/wireless/realtek/rtw89/coex.c
>> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
>> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>>   };
>>     static const u32 cxtbl[] = {
>> -	0xffffffff, /* 0 */
>> -	0xaaaaaaaa, /* 1 */
>> -	0x55555555, /* 2 */
>> -	0x66555555, /* 3 */
>> -	0x66556655, /* 4 */
>> -	0x5a5a5a5a, /* 5 */
>> -	0x5a5a5aaa, /* 6 */
>> -	0xaa5a5a5a, /* 7 */
>> -	0x6a5a5a5a, /* 8 */
>> -	0x6a5a5aaa, /* 9 */
>> -	0x6a5a6a5a, /* 10 */
>> -	0x6a5a6aaa, /* 11 */
>> -	0x6afa5afa, /* 12 */
>> -	0xaaaa5aaa, /* 13 */
>> -	0xaaffffaa, /* 14 */
>> -	0xaa5555aa, /* 15 */
>> -	0xfafafafa, /* 16 */
>> -	0xffffddff, /* 17 */
>> -	0xdaffdaff, /* 18 */
>> -	0xfafadafa  /* 19 */
>> +	[0]  = 0xffffffff,
>> +	[1]  = 0xaaaaaaaa,
>> +	[2]  = 0x55555555,
>> +	[3]  = 0x66555555,
>> +	[4]  = 0x66556655,
>> +	[5]  = 0x5a5a5a5a,
>> +	[6]  = 0x5a5a5aaa,
>> +	[7]  = 0xaa5a5a5a,
>> +	[8]  = 0x6a5a5a5a,
>> +	[9]  = 0x6a5a5aaa,
>> +	[10] = 0x6a5a6a5a,
>> +	[11] = 0x6a5a6aaa,
>> +	[12] = 0x6afa5afa,
>> +	[13] = 0xaaaa5aaa,
>> +	[14] = 0xaaffffaa,
>> +	[15] = 0xaa5555aa,
>> +	[16] = 0xfafafafa,
>> +	[17] = 0xffffddff,
>> +	[18] = 0xdaffdaff,
>> +	[19] = 0xfafadafa
>>   };
>>     struct rtw89_btc_btf_tlv {
>
>
> Is this change really necessary? Yes, the entries must be ordered;
> however, the comment carries that information at very few extra
> characters. To me, this patch looks like unneeded source churn.

One small benefit I see is to avoid the comment index being wrong and
there would be no way to catch that. But otherwise I don't have any
opinion about this.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Kalle Valo]

Larry Finger <Larry.Finger@lwfinger.net> writes:

> On 3/26/22 11:59, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>>   1 file changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
>> index 684583955511..3c83a0bfb120 100644
>> --- a/drivers/net/wireless/realtek/rtw89/coex.c
>> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
>> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>>   };
>>     static const u32 cxtbl[] = {
>> -	0xffffffff, /* 0 */
>> -	0xaaaaaaaa, /* 1 */
>> -	0x55555555, /* 2 */
>> -	0x66555555, /* 3 */
>> -	0x66556655, /* 4 */
>> -	0x5a5a5a5a, /* 5 */
>> -	0x5a5a5aaa, /* 6 */
>> -	0xaa5a5a5a, /* 7 */
>> -	0x6a5a5a5a, /* 8 */
>> -	0x6a5a5aaa, /* 9 */
>> -	0x6a5a6a5a, /* 10 */
>> -	0x6a5a6aaa, /* 11 */
>> -	0x6afa5afa, /* 12 */
>> -	0xaaaa5aaa, /* 13 */
>> -	0xaaffffaa, /* 14 */
>> -	0xaa5555aa, /* 15 */
>> -	0xfafafafa, /* 16 */
>> -	0xffffddff, /* 17 */
>> -	0xdaffdaff, /* 18 */
>> -	0xfafadafa  /* 19 */
>> +	[0]  = 0xffffffff,
>> +	[1]  = 0xaaaaaaaa,
>> +	[2]  = 0x55555555,
>> +	[3]  = 0x66555555,
>> +	[4]  = 0x66556655,
>> +	[5]  = 0x5a5a5a5a,
>> +	[6]  = 0x5a5a5aaa,
>> +	[7]  = 0xaa5a5a5a,
>> +	[8]  = 0x6a5a5a5a,
>> +	[9]  = 0x6a5a5aaa,
>> +	[10] = 0x6a5a6a5a,
>> +	[11] = 0x6a5a6aaa,
>> +	[12] = 0x6afa5afa,
>> +	[13] = 0xaaaa5aaa,
>> +	[14] = 0xaaffffaa,
>> +	[15] = 0xaa5555aa,
>> +	[16] = 0xfafafafa,
>> +	[17] = 0xffffddff,
>> +	[18] = 0xdaffdaff,
>> +	[19] = 0xfafadafa
>>   };
>>     struct rtw89_btc_btf_tlv {
>
>
> Is this change really necessary? Yes, the entries must be ordered;
> however, the comment carries that information at very few extra
> characters. To me, this patch looks like unneeded source churn.

One small benefit I see is to avoid the comment index being wrong and
there would be no way to catch that. But otherwise I don't have any
opinion about this.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[Kalle Valo]

Larry Finger <Larry.Finger@lwfinger.net> writes:

> On 3/26/22 11:59, Benjamin Stürz wrote:
>> This replaces comments with C99's designated
>> initializers because the kernel supports them now.
>>
>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
>> ---
>>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
>>   1 file changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
>> index 684583955511..3c83a0bfb120 100644
>> --- a/drivers/net/wireless/realtek/rtw89/coex.c
>> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
>> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
>>   };
>>     static const u32 cxtbl[] = {
>> -	0xffffffff, /* 0 */
>> -	0xaaaaaaaa, /* 1 */
>> -	0x55555555, /* 2 */
>> -	0x66555555, /* 3 */
>> -	0x66556655, /* 4 */
>> -	0x5a5a5a5a, /* 5 */
>> -	0x5a5a5aaa, /* 6 */
>> -	0xaa5a5a5a, /* 7 */
>> -	0x6a5a5a5a, /* 8 */
>> -	0x6a5a5aaa, /* 9 */
>> -	0x6a5a6a5a, /* 10 */
>> -	0x6a5a6aaa, /* 11 */
>> -	0x6afa5afa, /* 12 */
>> -	0xaaaa5aaa, /* 13 */
>> -	0xaaffffaa, /* 14 */
>> -	0xaa5555aa, /* 15 */
>> -	0xfafafafa, /* 16 */
>> -	0xffffddff, /* 17 */
>> -	0xdaffdaff, /* 18 */
>> -	0xfafadafa  /* 19 */
>> +	[0]  = 0xffffffff,
>> +	[1]  = 0xaaaaaaaa,
>> +	[2]  = 0x55555555,
>> +	[3]  = 0x66555555,
>> +	[4]  = 0x66556655,
>> +	[5]  = 0x5a5a5a5a,
>> +	[6]  = 0x5a5a5aaa,
>> +	[7]  = 0xaa5a5a5a,
>> +	[8]  = 0x6a5a5a5a,
>> +	[9]  = 0x6a5a5aaa,
>> +	[10] = 0x6a5a6a5a,
>> +	[11] = 0x6a5a6aaa,
>> +	[12] = 0x6afa5afa,
>> +	[13] = 0xaaaa5aaa,
>> +	[14] = 0xaaffffaa,
>> +	[15] = 0xaa5555aa,
>> +	[16] = 0xfafafafa,
>> +	[17] = 0xffffddff,
>> +	[18] = 0xdaffdaff,
>> +	[19] = 0xfafadafa
>>   };
>>     struct rtw89_btc_btf_tlv {
>
>
> Is this change really necessary? Yes, the entries must be ordered;
> however, the comment carries that information at very few extra
> characters. To me, this patch looks like unneeded source churn.

One small benefit I see is to avoid the comment index being wrong and
there would be no way to catch that. But otherwise I don't have any
opinion about this.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

RE: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[David Laight]

From: Kalle Valo
> Sent: 28 March 2022 10:29
> 
> Larry Finger <Larry.Finger@lwfinger.net> writes:
> 
> > On 3/26/22 11:59, Benjamin Stürz wrote:
> >> This replaces comments with C99's designated
> >> initializers because the kernel supports them now.
> >>
> >> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >> ---
> >>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
> >>   1 file changed, 20 insertions(+), 20 deletions(-)
> >>
> >> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> >> index 684583955511..3c83a0bfb120 100644
> >> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> >> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> >> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
> >>   };
> >>     static const u32 cxtbl[] = {
> >> -	0xffffffff, /* 0 */
> >> -	0xaaaaaaaa, /* 1 */
> >> -	0x55555555, /* 2 */
> >> -	0x66555555, /* 3 */
> >> -	0x66556655, /* 4 */
> >> -	0x5a5a5a5a, /* 5 */
> >> -	0x5a5a5aaa, /* 6 */
> >> -	0xaa5a5a5a, /* 7 */
> >> -	0x6a5a5a5a, /* 8 */
> >> -	0x6a5a5aaa, /* 9 */
> >> -	0x6a5a6a5a, /* 10 */
> >> -	0x6a5a6aaa, /* 11 */
> >> -	0x6afa5afa, /* 12 */
> >> -	0xaaaa5aaa, /* 13 */
> >> -	0xaaffffaa, /* 14 */
> >> -	0xaa5555aa, /* 15 */
> >> -	0xfafafafa, /* 16 */
> >> -	0xffffddff, /* 17 */
> >> -	0xdaffdaff, /* 18 */
> >> -	0xfafadafa  /* 19 */
> >> +	[0]  = 0xffffffff,
> >> +	[1]  = 0xaaaaaaaa,
> >> +	[2]  = 0x55555555,
> >> +	[3]  = 0x66555555,
> >> +	[4]  = 0x66556655,
> >> +	[5]  = 0x5a5a5a5a,
> >> +	[6]  = 0x5a5a5aaa,
> >> +	[7]  = 0xaa5a5a5a,
> >> +	[8]  = 0x6a5a5a5a,
> >> +	[9]  = 0x6a5a5aaa,
> >> +	[10] = 0x6a5a6a5a,
> >> +	[11] = 0x6a5a6aaa,
> >> +	[12] = 0x6afa5afa,
> >> +	[13] = 0xaaaa5aaa,
> >> +	[14] = 0xaaffffaa,
> >> +	[15] = 0xaa5555aa,
> >> +	[16] = 0xfafafafa,
> >> +	[17] = 0xffffddff,
> >> +	[18] = 0xdaffdaff,
> >> +	[19] = 0xfafadafa
> >>   };
> >>     struct rtw89_btc_btf_tlv {
> >
> >
> > Is this change really necessary? Yes, the entries must be ordered;
> > however, the comment carries that information at very few extra
> > characters. To me, this patch looks like unneeded source churn.
> 
> One small benefit I see is to avoid the comment index being wrong and
> there would be no way to catch that. But otherwise I don't have any
> opinion about this.

If the [nn] are wrong the effect is probably worse.
You really don't want a gap!

Doesn't seem worth using C99 initialisers unless they are
#defines or enum values.

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)

RE: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[David Laight]

From: Kalle Valo
> Sent: 28 March 2022 10:29
> 
> Larry Finger <Larry.Finger@lwfinger.net> writes:
> 
> > On 3/26/22 11:59, Benjamin Stürz wrote:
> >> This replaces comments with C99's designated
> >> initializers because the kernel supports them now.
> >>
> >> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >> ---
> >>   drivers/net/wireless/realtek/rtw89/coex.c | 40 +++++++++++------------
> >>   1 file changed, 20 insertions(+), 20 deletions(-)
> >>
> >> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> >> index 684583955511..3c83a0bfb120 100644
> >> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> >> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> >> @@ -97,26 +97,26 @@ static const struct rtw89_btc_fbtc_slot s_def[] = {
> >>   };
> >>     static const u32 cxtbl[] = {
> >> -	0xffffffff, /* 0 */
> >> -	0xaaaaaaaa, /* 1 */
> >> -	0x55555555, /* 2 */
> >> -	0x66555555, /* 3 */
> >> -	0x66556655, /* 4 */
> >> -	0x5a5a5a5a, /* 5 */
> >> -	0x5a5a5aaa, /* 6 */
> >> -	0xaa5a5a5a, /* 7 */
> >> -	0x6a5a5a5a, /* 8 */
> >> -	0x6a5a5aaa, /* 9 */
> >> -	0x6a5a6a5a, /* 10 */
> >> -	0x6a5a6aaa, /* 11 */
> >> -	0x6afa5afa, /* 12 */
> >> -	0xaaaa5aaa, /* 13 */
> >> -	0xaaffffaa, /* 14 */
> >> -	0xaa5555aa, /* 15 */
> >> -	0xfafafafa, /* 16 */
> >> -	0xffffddff, /* 17 */
> >> -	0xdaffdaff, /* 18 */
> >> -	0xfafadafa  /* 19 */
> >> +	[0]  = 0xffffffff,
> >> +	[1]  = 0xaaaaaaaa,
> >> +	[2]  = 0x55555555,
> >> +	[3]  = 0x66555555,
> >> +	[4]  = 0x66556655,
> >> +	[5]  = 0x5a5a5a5a,
> >> +	[6]  = 0x5a5a5aaa,
> >> +	[7]  = 0xaa5a5a5a,
> >> +	[8]  = 0x6a5a5a5a,
> >> +	[9]  = 0x6a5a5aaa,
> >> +	[10] = 0x6a5a6a5a,
> >> +	[11] = 0x6a5a6aaa,
> >> +	[12] = 0x6afa5afa,
> >> +	[13] = 0xaaaa5aaa,
> >> +	[14] = 0xaaffffaa,
> >> +	[15] = 0xaa5555aa,
> >> +	[16] = 0xfafafafa,
> >> +	[17] = 0xffffddff,
> >> +	[18] = 0xdaffdaff,
> >> +	[19] = 0xfafadafa
> >>   };
> >>     struct rtw89_btc_btf_tlv {
> >
> >
> > Is this change really necessary? Yes, the entries must be ordered;
> > however, the comment carries that information at very few extra
> > characters. To me, this patch looks like unneeded source churn.
> 
> One small benefit I see is to avoid the comment index being wrong and
> there would be no way to catch that. But otherwise I don't have any
> opinion about this.

If the [nn] are wrong the effect is probably worse.
You really don't want a gap!

Doesn't seem worth using C99 initialisers unless they are
#defines or enum values.

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)

RE: [PATCH 21/22] rtw89: Replace comments with C99 initializers

[David Laight]

RnJvbTogS2FsbGUgVmFsbw0KPiBTZW50OiAyOCBNYXJjaCAyMDIyIDEwOjI5DQo+IA0KPiBMYXJy
eSBGaW5nZXIgPExhcnJ5LkZpbmdlckBsd2Zpbmdlci5uZXQ+IHdyaXRlczoNCj4gDQo+ID4gT24g
My8yNi8yMiAxMTo1OSwgQmVuamFtaW4gU3TDvHJ6IHdyb3RlOg0KPiA+PiBUaGlzIHJlcGxhY2Vz
IGNvbW1lbnRzIHdpdGggQzk5J3MgZGVzaWduYXRlZA0KPiA+PiBpbml0aWFsaXplcnMgYmVjYXVz
ZSB0aGUga2VybmVsIHN1cHBvcnRzIHRoZW0gbm93Lg0KPiA+Pg0KPiA+PiBTaWduZWQtb2ZmLWJ5
OiBCZW5qYW1pbiBTdMO8cnogPGJlbm5pQHN0dWVyei54eXo+DQo+ID4+IC0tLQ0KPiA+PiAgIGRy
aXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsvcnR3ODkvY29leC5jIHwgNDAgKysrKysrKysrKyst
LS0tLS0tLS0tLS0NCj4gPj4gICAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjAg
ZGVsZXRpb25zKC0pDQo+ID4+DQo+ID4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVz
cy9yZWFsdGVrL3J0dzg5L2NvZXguYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsvcnR3
ODkvY29leC5jDQo+ID4+IGluZGV4IDY4NDU4Mzk1NTUxMS4uM2M4M2EwYmZiMTIwIDEwMDY0NA0K
PiA+PiAtLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0dzg5L2NvZXguYw0KPiA+
PiArKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0dzg5L2NvZXguYw0KPiA+PiBA
QCAtOTcsMjYgKzk3LDI2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcnR3ODlfYnRjX2ZidGNfc2xv
dCBzX2RlZltdID0gew0KPiA+PiAgIH07DQo+ID4+ICAgICBzdGF0aWMgY29uc3QgdTMyIGN4dGJs
W10gPSB7DQo+ID4+IC0JMHhmZmZmZmZmZiwgLyogMCAqLw0KPiA+PiAtCTB4YWFhYWFhYWEsIC8q
IDEgKi8NCj4gPj4gLQkweDU1NTU1NTU1LCAvKiAyICovDQo+ID4+IC0JMHg2NjU1NTU1NSwgLyog
MyAqLw0KPiA+PiAtCTB4NjY1NTY2NTUsIC8qIDQgKi8NCj4gPj4gLQkweDVhNWE1YTVhLCAvKiA1
ICovDQo+ID4+IC0JMHg1YTVhNWFhYSwgLyogNiAqLw0KPiA+PiAtCTB4YWE1YTVhNWEsIC8qIDcg
Ki8NCj4gPj4gLQkweDZhNWE1YTVhLCAvKiA4ICovDQo+ID4+IC0JMHg2YTVhNWFhYSwgLyogOSAq
Lw0KPiA+PiAtCTB4NmE1YTZhNWEsIC8qIDEwICovDQo+ID4+IC0JMHg2YTVhNmFhYSwgLyogMTEg
Ki8NCj4gPj4gLQkweDZhZmE1YWZhLCAvKiAxMiAqLw0KPiA+PiAtCTB4YWFhYTVhYWEsIC8qIDEz
ICovDQo+ID4+IC0JMHhhYWZmZmZhYSwgLyogMTQgKi8NCj4gPj4gLQkweGFhNTU1NWFhLCAvKiAx
NSAqLw0KPiA+PiAtCTB4ZmFmYWZhZmEsIC8qIDE2ICovDQo+ID4+IC0JMHhmZmZmZGRmZiwgLyog
MTcgKi8NCj4gPj4gLQkweGRhZmZkYWZmLCAvKiAxOCAqLw0KPiA+PiAtCTB4ZmFmYWRhZmEgIC8q
IDE5ICovDQo+ID4+ICsJWzBdICA9IDB4ZmZmZmZmZmYsDQo+ID4+ICsJWzFdICA9IDB4YWFhYWFh
YWEsDQo+ID4+ICsJWzJdICA9IDB4NTU1NTU1NTUsDQo+ID4+ICsJWzNdICA9IDB4NjY1NTU1NTUs
DQo+ID4+ICsJWzRdICA9IDB4NjY1NTY2NTUsDQo+ID4+ICsJWzVdICA9IDB4NWE1YTVhNWEsDQo+
ID4+ICsJWzZdICA9IDB4NWE1YTVhYWEsDQo+ID4+ICsJWzddICA9IDB4YWE1YTVhNWEsDQo+ID4+
ICsJWzhdICA9IDB4NmE1YTVhNWEsDQo+ID4+ICsJWzldICA9IDB4NmE1YTVhYWEsDQo+ID4+ICsJ
WzEwXSA9IDB4NmE1YTZhNWEsDQo+ID4+ICsJWzExXSA9IDB4NmE1YTZhYWEsDQo+ID4+ICsJWzEy
XSA9IDB4NmFmYTVhZmEsDQo+ID4+ICsJWzEzXSA9IDB4YWFhYTVhYWEsDQo+ID4+ICsJWzE0XSA9
IDB4YWFmZmZmYWEsDQo+ID4+ICsJWzE1XSA9IDB4YWE1NTU1YWEsDQo+ID4+ICsJWzE2XSA9IDB4
ZmFmYWZhZmEsDQo+ID4+ICsJWzE3XSA9IDB4ZmZmZmRkZmYsDQo+ID4+ICsJWzE4XSA9IDB4ZGFm
ZmRhZmYsDQo+ID4+ICsJWzE5XSA9IDB4ZmFmYWRhZmENCj4gPj4gICB9Ow0KPiA+PiAgICAgc3Ry
dWN0IHJ0dzg5X2J0Y19idGZfdGx2IHsNCj4gPg0KPiA+DQo+ID4gSXMgdGhpcyBjaGFuZ2UgcmVh
bGx5IG5lY2Vzc2FyeT8gWWVzLCB0aGUgZW50cmllcyBtdXN0IGJlIG9yZGVyZWQ7DQo+ID4gaG93
ZXZlciwgdGhlIGNvbW1lbnQgY2FycmllcyB0aGF0IGluZm9ybWF0aW9uIGF0IHZlcnkgZmV3IGV4
dHJhDQo+ID4gY2hhcmFjdGVycy4gVG8gbWUsIHRoaXMgcGF0Y2ggbG9va3MgbGlrZSB1bm5lZWRl
ZCBzb3VyY2UgY2h1cm4uDQo+IA0KPiBPbmUgc21hbGwgYmVuZWZpdCBJIHNlZSBpcyB0byBhdm9p
ZCB0aGUgY29tbWVudCBpbmRleCBiZWluZyB3cm9uZyBhbmQNCj4gdGhlcmUgd291bGQgYmUgbm8g
d2F5IHRvIGNhdGNoIHRoYXQuIEJ1dCBvdGhlcndpc2UgSSBkb24ndCBoYXZlIGFueQ0KPiBvcGlu
aW9uIGFib3V0IHRoaXMuDQoNCklmIHRoZSBbbm5dIGFyZSB3cm9uZyB0aGUgZWZmZWN0IGlzIHBy
b2JhYmx5IHdvcnNlLg0KWW91IHJlYWxseSBkb24ndCB3YW50IGEgZ2FwIQ0KDQpEb2Vzbid0IHNl
ZW0gd29ydGggdXNpbmcgQzk5IGluaXRpYWxpc2VycyB1bmxlc3MgdGhleSBhcmUNCiNkZWZpbmVz
IG9yIGVudW0gdmFsdWVzLg0KDQoJRGF2aWQNCg0KLQ0KUmVnaXN0ZXJlZCBBZGRyZXNzIExha2Vz
aWRlLCBCcmFtbGV5IFJvYWQsIE1vdW50IEZhcm0sIE1pbHRvbiBLZXluZXMsIE1LMSAxUFQsIFVL
DQpSZWdpc3RyYXRpb24gTm86IDEzOTczODYgKFdhbGVzKQ0K

[PATCH 22/22] pci: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/pci/probe.c | 116 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 17a969942d37..3de27b0765c8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -653,42 +653,42 @@ EXPORT_SYMBOL(pci_free_host_bridge);

 /* Indexed by PCI_X_SSTATUS_FREQ (secondary bus mode and frequency) */
 static const unsigned char pcix_bus_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCI_SPEED_66MHz_PCIX,		/* 1 */
-	PCI_SPEED_100MHz_PCIX,		/* 2 */
-	PCI_SPEED_133MHz_PCIX,		/* 3 */
-	PCI_SPEED_UNKNOWN,		/* 4 */
-	PCI_SPEED_66MHz_PCIX_ECC,	/* 5 */
-	PCI_SPEED_100MHz_PCIX_ECC,	/* 6 */
-	PCI_SPEED_133MHz_PCIX_ECC,	/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_66MHz_PCIX_266,	/* 9 */
-	PCI_SPEED_100MHz_PCIX_266,	/* A */
-	PCI_SPEED_133MHz_PCIX_266,	/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_66MHz_PCIX_533,	/* D */
-	PCI_SPEED_100MHz_PCIX_533,	/* E */
-	PCI_SPEED_133MHz_PCIX_533	/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCI_SPEED_66MHz_PCIX,
+	[0x2] = PCI_SPEED_100MHz_PCIX,
+	[0x3] = PCI_SPEED_133MHz_PCIX,
+	[0x4] = PCI_SPEED_UNKNOWN,
+	[0x5] = PCI_SPEED_66MHz_PCIX_ECC,
+	[0x6] = PCI_SPEED_100MHz_PCIX_ECC,
+	[0x7] = PCI_SPEED_133MHz_PCIX_ECC,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_66MHz_PCIX_266,
+	[0xA] = PCI_SPEED_100MHz_PCIX_266,
+	[0xB] = PCI_SPEED_133MHz_PCIX_266,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_66MHz_PCIX_533,
+	[0xE] = PCI_SPEED_100MHz_PCIX_533,
+	[0xF] = PCI_SPEED_133MHz_PCIX_533
 };

 /* Indexed by PCI_EXP_LNKCAP_SLS, PCI_EXP_LNKSTA_CLS */
 const unsigned char pcie_link_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCIE_SPEED_2_5GT,		/* 1 */
-	PCIE_SPEED_5_0GT,		/* 2 */
-	PCIE_SPEED_8_0GT,		/* 3 */
-	PCIE_SPEED_16_0GT,		/* 4 */
-	PCIE_SPEED_32_0GT,		/* 5 */
-	PCIE_SPEED_64_0GT,		/* 6 */
-	PCI_SPEED_UNKNOWN,		/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_UNKNOWN,		/* 9 */
-	PCI_SPEED_UNKNOWN,		/* A */
-	PCI_SPEED_UNKNOWN,		/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_UNKNOWN,		/* D */
-	PCI_SPEED_UNKNOWN,		/* E */
-	PCI_SPEED_UNKNOWN		/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCIE_SPEED_2_5GT,
+	[0x2] = PCIE_SPEED_5_0GT,
+	[0x3] = PCIE_SPEED_8_0GT,
+	[0x4] = PCIE_SPEED_16_0GT,
+	[0x5] = PCIE_SPEED_32_0GT,
+	[0x6] = PCIE_SPEED_64_0GT,
+	[0x7] = PCI_SPEED_UNKNOWN,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_UNKNOWN,
+	[0xA] = PCI_SPEED_UNKNOWN,
+	[0xB] = PCI_SPEED_UNKNOWN,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_UNKNOWN,
+	[0xE] = PCI_SPEED_UNKNOWN,
+	[0xF] = PCI_SPEED_UNKNOWN
 };
 EXPORT_SYMBOL_GPL(pcie_link_speed);

@@ -696,32 +696,32 @@ const char *pci_speed_string(enum pci_bus_speed speed)
 {
 	/* Indexed by the pci_bus_speed enum */
 	static const char *speed_strings[] = {
-	    "33 MHz PCI",		/* 0x00 */
-	    "66 MHz PCI",		/* 0x01 */
-	    "66 MHz PCI-X",		/* 0x02 */
-	    "100 MHz PCI-X",		/* 0x03 */
-	    "133 MHz PCI-X",		/* 0x04 */
-	    NULL,			/* 0x05 */
-	    NULL,			/* 0x06 */
-	    NULL,			/* 0x07 */
-	    NULL,			/* 0x08 */
-	    "66 MHz PCI-X 266",		/* 0x09 */
-	    "100 MHz PCI-X 266",	/* 0x0a */
-	    "133 MHz PCI-X 266",	/* 0x0b */
-	    "Unknown AGP",		/* 0x0c */
-	    "1x AGP",			/* 0x0d */
-	    "2x AGP",			/* 0x0e */
-	    "4x AGP",			/* 0x0f */
-	    "8x AGP",			/* 0x10 */
-	    "66 MHz PCI-X 533",		/* 0x11 */
-	    "100 MHz PCI-X 533",	/* 0x12 */
-	    "133 MHz PCI-X 533",	/* 0x13 */
-	    "2.5 GT/s PCIe",		/* 0x14 */
-	    "5.0 GT/s PCIe",		/* 0x15 */
-	    "8.0 GT/s PCIe",		/* 0x16 */
-	    "16.0 GT/s PCIe",		/* 0x17 */
-	    "32.0 GT/s PCIe",		/* 0x18 */
-	    "64.0 GT/s PCIe",		/* 0x19 */
+		[0x00] = "33 MHz PCI",
+		[0x01] = "66 MHz PCI",
+		[0x02] = "66 MHz PCI-X",
+		[0x03] = "100 MHz PCI-X",
+		[0x04] = "133 MHz PCI-X",
+		[0x05] = NULL,
+		[0x06] = NULL,
+		[0x07] = NULL,
+		[0x08] = NULL,
+		[0x09] = "66 MHz PCI-X 266",
+		[0x0a] = "100 MHz PCI-X 266",
+		[0x0b] = "133 MHz PCI-X 266",
+		[0x0c] = "Unknown AGP",
+		[0x0d] = "1x AGP",
+		[0x0e] = "2x AGP",
+		[0x0f] = "4x AGP",
+		[0x10] = "8x AGP",
+		[0x11] = "66 MHz PCI-X 533",
+		[0x12] = "100 MHz PCI-X 533",
+		[0x13] = "133 MHz PCI-X 533",
+		[0x14] = "2.5 GT/s PCIe",
+		[0x15] = "5.0 GT/s PCIe",
+		[0x16] = "8.0 GT/s PCIe",
+		[0x17] = "16.0 GT/s PCIe",
+		[0x18] = "32.0 GT/s PCIe",
+		[0x19] = "64.0 GT/s PCIe",
 	};

 	if (speed < ARRAY_SIZE(speed_strings))
--
2.35.1

[PATCH 22/22] pci: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/pci/probe.c | 116 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 17a969942d37..3de27b0765c8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -653,42 +653,42 @@ EXPORT_SYMBOL(pci_free_host_bridge);

 /* Indexed by PCI_X_SSTATUS_FREQ (secondary bus mode and frequency) */
 static const unsigned char pcix_bus_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCI_SPEED_66MHz_PCIX,		/* 1 */
-	PCI_SPEED_100MHz_PCIX,		/* 2 */
-	PCI_SPEED_133MHz_PCIX,		/* 3 */
-	PCI_SPEED_UNKNOWN,		/* 4 */
-	PCI_SPEED_66MHz_PCIX_ECC,	/* 5 */
-	PCI_SPEED_100MHz_PCIX_ECC,	/* 6 */
-	PCI_SPEED_133MHz_PCIX_ECC,	/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_66MHz_PCIX_266,	/* 9 */
-	PCI_SPEED_100MHz_PCIX_266,	/* A */
-	PCI_SPEED_133MHz_PCIX_266,	/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_66MHz_PCIX_533,	/* D */
-	PCI_SPEED_100MHz_PCIX_533,	/* E */
-	PCI_SPEED_133MHz_PCIX_533	/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCI_SPEED_66MHz_PCIX,
+	[0x2] = PCI_SPEED_100MHz_PCIX,
+	[0x3] = PCI_SPEED_133MHz_PCIX,
+	[0x4] = PCI_SPEED_UNKNOWN,
+	[0x5] = PCI_SPEED_66MHz_PCIX_ECC,
+	[0x6] = PCI_SPEED_100MHz_PCIX_ECC,
+	[0x7] = PCI_SPEED_133MHz_PCIX_ECC,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_66MHz_PCIX_266,
+	[0xA] = PCI_SPEED_100MHz_PCIX_266,
+	[0xB] = PCI_SPEED_133MHz_PCIX_266,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_66MHz_PCIX_533,
+	[0xE] = PCI_SPEED_100MHz_PCIX_533,
+	[0xF] = PCI_SPEED_133MHz_PCIX_533
 };

 /* Indexed by PCI_EXP_LNKCAP_SLS, PCI_EXP_LNKSTA_CLS */
 const unsigned char pcie_link_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCIE_SPEED_2_5GT,		/* 1 */
-	PCIE_SPEED_5_0GT,		/* 2 */
-	PCIE_SPEED_8_0GT,		/* 3 */
-	PCIE_SPEED_16_0GT,		/* 4 */
-	PCIE_SPEED_32_0GT,		/* 5 */
-	PCIE_SPEED_64_0GT,		/* 6 */
-	PCI_SPEED_UNKNOWN,		/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_UNKNOWN,		/* 9 */
-	PCI_SPEED_UNKNOWN,		/* A */
-	PCI_SPEED_UNKNOWN,		/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_UNKNOWN,		/* D */
-	PCI_SPEED_UNKNOWN,		/* E */
-	PCI_SPEED_UNKNOWN		/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCIE_SPEED_2_5GT,
+	[0x2] = PCIE_SPEED_5_0GT,
+	[0x3] = PCIE_SPEED_8_0GT,
+	[0x4] = PCIE_SPEED_16_0GT,
+	[0x5] = PCIE_SPEED_32_0GT,
+	[0x6] = PCIE_SPEED_64_0GT,
+	[0x7] = PCI_SPEED_UNKNOWN,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_UNKNOWN,
+	[0xA] = PCI_SPEED_UNKNOWN,
+	[0xB] = PCI_SPEED_UNKNOWN,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_UNKNOWN,
+	[0xE] = PCI_SPEED_UNKNOWN,
+	[0xF] = PCI_SPEED_UNKNOWN
 };
 EXPORT_SYMBOL_GPL(pcie_link_speed);

@@ -696,32 +696,32 @@ const char *pci_speed_string(enum pci_bus_speed speed)
 {
 	/* Indexed by the pci_bus_speed enum */
 	static const char *speed_strings[] = {
-	    "33 MHz PCI",		/* 0x00 */
-	    "66 MHz PCI",		/* 0x01 */
-	    "66 MHz PCI-X",		/* 0x02 */
-	    "100 MHz PCI-X",		/* 0x03 */
-	    "133 MHz PCI-X",		/* 0x04 */
-	    NULL,			/* 0x05 */
-	    NULL,			/* 0x06 */
-	    NULL,			/* 0x07 */
-	    NULL,			/* 0x08 */
-	    "66 MHz PCI-X 266",		/* 0x09 */
-	    "100 MHz PCI-X 266",	/* 0x0a */
-	    "133 MHz PCI-X 266",	/* 0x0b */
-	    "Unknown AGP",		/* 0x0c */
-	    "1x AGP",			/* 0x0d */
-	    "2x AGP",			/* 0x0e */
-	    "4x AGP",			/* 0x0f */
-	    "8x AGP",			/* 0x10 */
-	    "66 MHz PCI-X 533",		/* 0x11 */
-	    "100 MHz PCI-X 533",	/* 0x12 */
-	    "133 MHz PCI-X 533",	/* 0x13 */
-	    "2.5 GT/s PCIe",		/* 0x14 */
-	    "5.0 GT/s PCIe",		/* 0x15 */
-	    "8.0 GT/s PCIe",		/* 0x16 */
-	    "16.0 GT/s PCIe",		/* 0x17 */
-	    "32.0 GT/s PCIe",		/* 0x18 */
-	    "64.0 GT/s PCIe",		/* 0x19 */
+		[0x00] = "33 MHz PCI",
+		[0x01] = "66 MHz PCI",
+		[0x02] = "66 MHz PCI-X",
+		[0x03] = "100 MHz PCI-X",
+		[0x04] = "133 MHz PCI-X",
+		[0x05] = NULL,
+		[0x06] = NULL,
+		[0x07] = NULL,
+		[0x08] = NULL,
+		[0x09] = "66 MHz PCI-X 266",
+		[0x0a] = "100 MHz PCI-X 266",
+		[0x0b] = "133 MHz PCI-X 266",
+		[0x0c] = "Unknown AGP",
+		[0x0d] = "1x AGP",
+		[0x0e] = "2x AGP",
+		[0x0f] = "4x AGP",
+		[0x10] = "8x AGP",
+		[0x11] = "66 MHz PCI-X 533",
+		[0x12] = "100 MHz PCI-X 533",
+		[0x13] = "133 MHz PCI-X 533",
+		[0x14] = "2.5 GT/s PCIe",
+		[0x15] = "5.0 GT/s PCIe",
+		[0x16] = "8.0 GT/s PCIe",
+		[0x17] = "16.0 GT/s PCIe",
+		[0x18] = "32.0 GT/s PCIe",
+		[0x19] = "64.0 GT/s PCIe",
 	};

 	if (speed < ARRAY_SIZE(speed_strings))
--
2.35.1

[PATCH 22/22] pci: Replace comments with C99 initializers

[Benjamin Stürz]

This replaces comments with C99's designated
initializers because the kernel supports them now.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 drivers/pci/probe.c | 116 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 17a969942d37..3de27b0765c8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -653,42 +653,42 @@ EXPORT_SYMBOL(pci_free_host_bridge);

 /* Indexed by PCI_X_SSTATUS_FREQ (secondary bus mode and frequency) */
 static const unsigned char pcix_bus_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCI_SPEED_66MHz_PCIX,		/* 1 */
-	PCI_SPEED_100MHz_PCIX,		/* 2 */
-	PCI_SPEED_133MHz_PCIX,		/* 3 */
-	PCI_SPEED_UNKNOWN,		/* 4 */
-	PCI_SPEED_66MHz_PCIX_ECC,	/* 5 */
-	PCI_SPEED_100MHz_PCIX_ECC,	/* 6 */
-	PCI_SPEED_133MHz_PCIX_ECC,	/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_66MHz_PCIX_266,	/* 9 */
-	PCI_SPEED_100MHz_PCIX_266,	/* A */
-	PCI_SPEED_133MHz_PCIX_266,	/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_66MHz_PCIX_533,	/* D */
-	PCI_SPEED_100MHz_PCIX_533,	/* E */
-	PCI_SPEED_133MHz_PCIX_533	/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCI_SPEED_66MHz_PCIX,
+	[0x2] = PCI_SPEED_100MHz_PCIX,
+	[0x3] = PCI_SPEED_133MHz_PCIX,
+	[0x4] = PCI_SPEED_UNKNOWN,
+	[0x5] = PCI_SPEED_66MHz_PCIX_ECC,
+	[0x6] = PCI_SPEED_100MHz_PCIX_ECC,
+	[0x7] = PCI_SPEED_133MHz_PCIX_ECC,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_66MHz_PCIX_266,
+	[0xA] = PCI_SPEED_100MHz_PCIX_266,
+	[0xB] = PCI_SPEED_133MHz_PCIX_266,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_66MHz_PCIX_533,
+	[0xE] = PCI_SPEED_100MHz_PCIX_533,
+	[0xF] = PCI_SPEED_133MHz_PCIX_533
 };

 /* Indexed by PCI_EXP_LNKCAP_SLS, PCI_EXP_LNKSTA_CLS */
 const unsigned char pcie_link_speed[] = {
-	PCI_SPEED_UNKNOWN,		/* 0 */
-	PCIE_SPEED_2_5GT,		/* 1 */
-	PCIE_SPEED_5_0GT,		/* 2 */
-	PCIE_SPEED_8_0GT,		/* 3 */
-	PCIE_SPEED_16_0GT,		/* 4 */
-	PCIE_SPEED_32_0GT,		/* 5 */
-	PCIE_SPEED_64_0GT,		/* 6 */
-	PCI_SPEED_UNKNOWN,		/* 7 */
-	PCI_SPEED_UNKNOWN,		/* 8 */
-	PCI_SPEED_UNKNOWN,		/* 9 */
-	PCI_SPEED_UNKNOWN,		/* A */
-	PCI_SPEED_UNKNOWN,		/* B */
-	PCI_SPEED_UNKNOWN,		/* C */
-	PCI_SPEED_UNKNOWN,		/* D */
-	PCI_SPEED_UNKNOWN,		/* E */
-	PCI_SPEED_UNKNOWN		/* F */
+	[0x0] = PCI_SPEED_UNKNOWN,
+	[0x1] = PCIE_SPEED_2_5GT,
+	[0x2] = PCIE_SPEED_5_0GT,
+	[0x3] = PCIE_SPEED_8_0GT,
+	[0x4] = PCIE_SPEED_16_0GT,
+	[0x5] = PCIE_SPEED_32_0GT,
+	[0x6] = PCIE_SPEED_64_0GT,
+	[0x7] = PCI_SPEED_UNKNOWN,
+	[0x8] = PCI_SPEED_UNKNOWN,
+	[0x9] = PCI_SPEED_UNKNOWN,
+	[0xA] = PCI_SPEED_UNKNOWN,
+	[0xB] = PCI_SPEED_UNKNOWN,
+	[0xC] = PCI_SPEED_UNKNOWN,
+	[0xD] = PCI_SPEED_UNKNOWN,
+	[0xE] = PCI_SPEED_UNKNOWN,
+	[0xF] = PCI_SPEED_UNKNOWN
 };
 EXPORT_SYMBOL_GPL(pcie_link_speed);

@@ -696,32 +696,32 @@ const char *pci_speed_string(enum pci_bus_speed speed)
 {
 	/* Indexed by the pci_bus_speed enum */
 	static const char *speed_strings[] = {
-	    "33 MHz PCI",		/* 0x00 */
-	    "66 MHz PCI",		/* 0x01 */
-	    "66 MHz PCI-X",		/* 0x02 */
-	    "100 MHz PCI-X",		/* 0x03 */
-	    "133 MHz PCI-X",		/* 0x04 */
-	    NULL,			/* 0x05 */
-	    NULL,			/* 0x06 */
-	    NULL,			/* 0x07 */
-	    NULL,			/* 0x08 */
-	    "66 MHz PCI-X 266",		/* 0x09 */
-	    "100 MHz PCI-X 266",	/* 0x0a */
-	    "133 MHz PCI-X 266",	/* 0x0b */
-	    "Unknown AGP",		/* 0x0c */
-	    "1x AGP",			/* 0x0d */
-	    "2x AGP",			/* 0x0e */
-	    "4x AGP",			/* 0x0f */
-	    "8x AGP",			/* 0x10 */
-	    "66 MHz PCI-X 533",		/* 0x11 */
-	    "100 MHz PCI-X 533",	/* 0x12 */
-	    "133 MHz PCI-X 533",	/* 0x13 */
-	    "2.5 GT/s PCIe",		/* 0x14 */
-	    "5.0 GT/s PCIe",		/* 0x15 */
-	    "8.0 GT/s PCIe",		/* 0x16 */
-	    "16.0 GT/s PCIe",		/* 0x17 */
-	    "32.0 GT/s PCIe",		/* 0x18 */
-	    "64.0 GT/s PCIe",		/* 0x19 */
+		[0x00] = "33 MHz PCI",
+		[0x01] = "66 MHz PCI",
+		[0x02] = "66 MHz PCI-X",
+		[0x03] = "100 MHz PCI-X",
+		[0x04] = "133 MHz PCI-X",
+		[0x05] = NULL,
+		[0x06] = NULL,
+		[0x07] = NULL,
+		[0x08] = NULL,
+		[0x09] = "66 MHz PCI-X 266",
+		[0x0a] = "100 MHz PCI-X 266",
+		[0x0b] = "133 MHz PCI-X 266",
+		[0x0c] = "Unknown AGP",
+		[0x0d] = "1x AGP",
+		[0x0e] = "2x AGP",
+		[0x0f] = "4x AGP",
+		[0x10] = "8x AGP",
+		[0x11] = "66 MHz PCI-X 533",
+		[0x12] = "100 MHz PCI-X 533",
+		[0x13] = "133 MHz PCI-X 533",
+		[0x14] = "2.5 GT/s PCIe",
+		[0x15] = "5.0 GT/s PCIe",
+		[0x16] = "8.0 GT/s PCIe",
+		[0x17] = "16.0 GT/s PCIe",
+		[0x18] = "32.0 GT/s PCIe",
+		[0x19] = "64.0 GT/s PCIe",
 	};

 	if (speed < ARRAY_SIZE(speed_strings))
--
2.35.1

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:58:48 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Please:

1. Split this series per sub-system. It makes no sense to mailbomb all
   subsystems for things that won't belong there;

2. Add a patch 00 to the series, in order to make easier to do reviews
   like this that are meant to the series as a hole.

Regards,
Mauro
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  



Thanks,
Mauro

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:58:48 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Please:

1. Split this series per sub-system. It makes no sense to mailbomb all
   subsystems for things that won't belong there;

2. Add a patch 00 to the series, in order to make easier to do reviews
   like this that are meant to the series as a hole.

Regards,
Mauro
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  



Thanks,
Mauro

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Mauro Carvalho Chehab]

Em Sat, 26 Mar 2022 17:58:48 +0100
Benjamin Stürz <benni@stuerz.xyz> escreveu:

> This replaces comments with C99's designated
> initializers because the kernel supports them now.

Please:

1. Split this series per sub-system. It makes no sense to mailbomb all
   subsystems for things that won't belong there;

2. Add a patch 00 to the series, in order to make easier to do reviews
   like this that are meant to the series as a hole.

Regards,
Mauro
> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  



Thanks,
Mauro

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Arnd Bergmann]

On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

The change looks fine, but the comment looks misplaced, as enum initializers
are not c99 feature. Also, the named array and struct intializers have been
supported by gnu89 for a long time and widely used in the kernel, so it's
not a recent change even for the others.

Also,

      Arnd

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Arnd Bergmann]

On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

The change looks fine, but the comment looks misplaced, as enum initializers
are not c99 feature. Also, the named array and struct intializers have been
supported by gnu89 for a long time and widely used in the kernel, so it's
not a recent change even for the others.

Also,

      Arnd

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Arnd Bergmann]

On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

The change looks fine, but the comment looks misplaced, as enum initializers
are not c99 feature. Also, the named array and struct intializers have been
supported by gnu89 for a long time and widely used in the kernel, so it's
not a recent change even for the others.

Also,

      Arnd

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Segher Boessenkool]

On Sat, Mar 26, 2022 at 08:23:31PM +0100, Arnd Bergmann wrote:
> On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> The change looks fine, but the comment looks misplaced, as enum initializers
> are not c99 feature.

Yes, it is from C89/C90.

> Also, the named array and struct intializers have been
> supported by gnu89 for a long time and widely used in the kernel, so it's
> not a recent change even for the others.

GCC supports this since 1998.  There was a syntax different from C99
designated initializers (".ans = 42") before (namely, "ans: 42").

1998 is long enough ago for all intents and purposes now of course ;-)


Segher

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Segher Boessenkool]

On Sat, Mar 26, 2022 at 08:23:31PM +0100, Arnd Bergmann wrote:
> On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> The change looks fine, but the comment looks misplaced, as enum initializers
> are not c99 feature.

Yes, it is from C89/C90.

> Also, the named array and struct intializers have been
> supported by gnu89 for a long time and widely used in the kernel, so it's
> not a recent change even for the others.

GCC supports this since 1998.  There was a syntax different from C99
designated initializers (".ans = 42") before (namely, "ans: 42").

1998 is long enough ago for all intents and purposes now of course ;-)


Segher

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Segher Boessenkool]

On Sat, Mar 26, 2022 at 08:23:31PM +0100, Arnd Bergmann wrote:
> On Sat, Mar 26, 2022 at 5:58 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
> >
> > This replaces comments with C99's designated
> > initializers because the kernel supports them now.
> 
> The change looks fine, but the comment looks misplaced, as enum initializers
> are not c99 feature.

Yes, it is from C89/C90.

> Also, the named array and struct intializers have been
> supported by gnu89 for a long time and widely used in the kernel, so it's
> not a recent change even for the others.

GCC supports this since 1998.  There was a syntax different from C99
designated initializers (".ans = 42") before (namely, "ans: 42").

1998 is long enough ago for all intents and purposes now of course ;-)


Segher

[PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

This patch series replaces comments with C99's designated initializers
in a few places. It also adds some enum initializers. This is my first
time contributing to the Linux kernel, therefore I'm probably doing a
lot of things the wrong way. I'm sorry for that.

I've gotten a few emails so far stating that this patch series is
unnecessary. Yes, in fact this patch series is not necessary by itself,
but it could help me understand how the whole process works and maybe I
could help somewhere, where help is actually needed.

This patch itself is a no-op.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7afd412dadd2..706f667261eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 *.dtb
 *.dtbo
 *.dtb.S
-*.dwo
+*.dwo
 *.elf
 *.gcno
 *.gz
-- 
2.35.1

[PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

This patch series replaces comments with C99's designated initializers
in a few places. It also adds some enum initializers. This is my first
time contributing to the Linux kernel, therefore I'm probably doing a
lot of things the wrong way. I'm sorry for that.

I've gotten a few emails so far stating that this patch series is
unnecessary. Yes, in fact this patch series is not necessary by itself,
but it could help me understand how the whole process works and maybe I
could help somewhere, where help is actually needed.

This patch itself is a no-op.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7afd412dadd2..706f667261eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 *.dtb
 *.dtbo
 *.dtb.S
-*.dwo
+*.dwo
 *.elf
 *.gcno
 *.gz
-- 
2.35.1

[PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

This patch series replaces comments with C99's designated initializers
in a few places. It also adds some enum initializers. This is my first
time contributing to the Linux kernel, therefore I'm probably doing a
lot of things the wrong way. I'm sorry for that.

I've gotten a few emails so far stating that this patch series is
unnecessary. Yes, in fact this patch series is not necessary by itself,
but it could help me understand how the whole process works and maybe I
could help somewhere, where help is actually needed.

This patch itself is a no-op.

Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7afd412dadd2..706f667261eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 *.dtb
 *.dtbo
 *.dtb.S
-*.dwo
+*.dwo
 *.elf
 *.gcno
 *.gz
-- 
2.35.1

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Just a small tip: If you are new, start with something small and learn
from that. Don't do a controversial big patchset spanning multiple
subsystems, that's the hard way to learn things. First submit one patch
at a time to one subsystem and gain understanding of the process that
way.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Just a small tip: If you are new, start with something small and learn
from that. Don't do a controversial big patchset spanning multiple
subsystems, that's the hard way to learn things. First submit one patch
at a time to one subsystem and gain understanding of the process that
way.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Just a small tip: If you are new, start with something small and learn
from that. Don't do a controversial big patchset spanning multiple
subsystems, that's the hard way to learn things. First submit one patch
at a time to one subsystem and gain understanding of the process that
way.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

On 28.03.22 11:33, Kalle Valo wrote:
> Benjamin Stürz <benni@stuerz.xyz> writes:
> 
>> This patch series replaces comments with C99's designated initializers
>> in a few places. It also adds some enum initializers. This is my first
>> time contributing to the Linux kernel, therefore I'm probably doing a
>> lot of things the wrong way. I'm sorry for that.
> 
> Just a small tip: If you are new, start with something small and learn
> from that. Don't do a controversial big patchset spanning multiple
> subsystems, that's the hard way to learn things. First submit one patch
> at a time to one subsystem and gain understanding of the process that
> way.
> 

I actually thought this would be such simple thing. Do you know of any
good thing where to start? I already looked into drivers/staging/*/TODO
and didn't found something for me personally.

Should I drop this patchset and start with something different? If yes,
what would the proper way to drop it? Just announcing, that this is
going nowhere in a separate patch?

Re: [PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

On 28.03.22 11:33, Kalle Valo wrote:
> Benjamin Stürz <benni@stuerz.xyz> writes:
> 
>> This patch series replaces comments with C99's designated initializers
>> in a few places. It also adds some enum initializers. This is my first
>> time contributing to the Linux kernel, therefore I'm probably doing a
>> lot of things the wrong way. I'm sorry for that.
> 
> Just a small tip: If you are new, start with something small and learn
> from that. Don't do a controversial big patchset spanning multiple
> subsystems, that's the hard way to learn things. First submit one patch
> at a time to one subsystem and gain understanding of the process that
> way.
> 

I actually thought this would be such simple thing. Do you know of any
good thing where to start? I already looked into drivers/staging/*/TODO
and didn't found something for me personally.

Should I drop this patchset and start with something different? If yes,
what would the proper way to drop it? Just announcing, that this is
going nowhere in a separate patch?

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

On 28.03.22 11:33, Kalle Valo wrote:
> Benjamin Stürz <benni@stuerz.xyz> writes:
> 
>> This patch series replaces comments with C99's designated initializers
>> in a few places. It also adds some enum initializers. This is my first
>> time contributing to the Linux kernel, therefore I'm probably doing a
>> lot of things the wrong way. I'm sorry for that.
> 
> Just a small tip: If you are new, start with something small and learn
> from that. Don't do a controversial big patchset spanning multiple
> subsystems, that's the hard way to learn things. First submit one patch
> at a time to one subsystem and gain understanding of the process that
> way.
> 

I actually thought this would be such simple thing. Do you know of any
good thing where to start? I already looked into drivers/staging/*/TODO
and didn't found something for me personally.

Should I drop this patchset and start with something different? If yes,
what would the proper way to drop it? Just announcing, that this is
going nowhere in a separate patch?

Re: [PATCH 00/22] Replace comments with C99 initializers

[Benjamin Stürz]

On 28.03.22 11:33, Kalle Valo wrote:
> Benjamin Stürz <benni@stuerz.xyz> writes:
> 
>> This patch series replaces comments with C99's designated initializers
>> in a few places. It also adds some enum initializers. This is my first
>> time contributing to the Linux kernel, therefore I'm probably doing a
>> lot of things the wrong way. I'm sorry for that.
> 
> Just a small tip: If you are new, start with something small and learn
> from that. Don't do a controversial big patchset spanning multiple
> subsystems, that's the hard way to learn things. First submit one patch
> at a time to one subsystem and gain understanding of the process that
> way.
> 

I actually thought this would be such simple thing. Do you know of any
good thing where to start? I already looked into drivers/staging/*/TODO
and didn't found something for me personally.

Should I drop this patchset and start with something different? If yes,
what would the proper way to drop it? Just announcing, that this is
going nowhere in a separate patch?

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> On 28.03.22 11:33, Kalle Valo wrote:
>> Benjamin Stürz <benni@stuerz.xyz> writes:
>> 
>>> This patch series replaces comments with C99's designated initializers
>>> in a few places. It also adds some enum initializers. This is my first
>>> time contributing to the Linux kernel, therefore I'm probably doing a
>>> lot of things the wrong way. I'm sorry for that.
>> 
>> Just a small tip: If you are new, start with something small and learn
>> from that. Don't do a controversial big patchset spanning multiple
>> subsystems, that's the hard way to learn things. First submit one patch
>> at a time to one subsystem and gain understanding of the process that
>> way.
>
> I actually thought this would be such simple thing.

If there are 22 patches and a dozen different subsystems it's far from
simple, as you noticed from your replies :)

> Do you know of any good thing where to start? I already looked into
> drivers/staging/*/TODO and didn't found something for me personally.

I work in wireless and one my annoyance is use of BUG_ON() in wireless
drivers. There just isn't a good reason to crash the whole system when
there's a bug in a wireless driver or firmware. You can get list like
this:

git grep BUG_ON drivers/net/wireless/ | grep -v BUILD_BUG_ON

It might not be always trivial to fix BUG_ON() usage, so it would be a
good challenge as well. See the wiki link below how to submit wireless
patches. But just send a one patch first, don't work for several hours
and then submit a big set of patches.

We also might have a todo list somewhere in the wiki, but don't know how
to up-to-date it is.

> Should I drop this patchset and start with something different? 

Like Mauro suggested, splitting the patchset per subsystem is a very
good idea. And first try out with one subsystem, and after seeing how it
goes (if they are accepted or rejected), decide if you send more patches
to other subsystems.

> If yes, what would the proper way to drop it? Just announcing, that
> this is going nowhere in a separate patch?

Replying to Mauro's email and telling your intentions is a good way to
inform everyone.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> On 28.03.22 11:33, Kalle Valo wrote:
>> Benjamin Stürz <benni@stuerz.xyz> writes:
>> 
>>> This patch series replaces comments with C99's designated initializers
>>> in a few places. It also adds some enum initializers. This is my first
>>> time contributing to the Linux kernel, therefore I'm probably doing a
>>> lot of things the wrong way. I'm sorry for that.
>> 
>> Just a small tip: If you are new, start with something small and learn
>> from that. Don't do a controversial big patchset spanning multiple
>> subsystems, that's the hard way to learn things. First submit one patch
>> at a time to one subsystem and gain understanding of the process that
>> way.
>
> I actually thought this would be such simple thing.

If there are 22 patches and a dozen different subsystems it's far from
simple, as you noticed from your replies :)

> Do you know of any good thing where to start? I already looked into
> drivers/staging/*/TODO and didn't found something for me personally.

I work in wireless and one my annoyance is use of BUG_ON() in wireless
drivers. There just isn't a good reason to crash the whole system when
there's a bug in a wireless driver or firmware. You can get list like
this:

git grep BUG_ON drivers/net/wireless/ | grep -v BUILD_BUG_ON

It might not be always trivial to fix BUG_ON() usage, so it would be a
good challenge as well. See the wiki link below how to submit wireless
patches. But just send a one patch first, don't work for several hours
and then submit a big set of patches.

We also might have a todo list somewhere in the wiki, but don't know how
to up-to-date it is.

> Should I drop this patchset and start with something different? 

Like Mauro suggested, splitting the patchset per subsystem is a very
good idea. And first try out with one subsystem, and after seeing how it
goes (if they are accepted or rejected), decide if you send more patches
to other subsystems.

> If yes, what would the proper way to drop it? Just announcing, that
> this is going nowhere in a separate patch?

Replying to Mauro's email and telling your intentions is a good way to
inform everyone.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> On 28.03.22 11:33, Kalle Valo wrote:
>> Benjamin Stürz <benni@stuerz.xyz> writes:
>> 
>>> This patch series replaces comments with C99's designated initializers
>>> in a few places. It also adds some enum initializers. This is my first
>>> time contributing to the Linux kernel, therefore I'm probably doing a
>>> lot of things the wrong way. I'm sorry for that.
>> 
>> Just a small tip: If you are new, start with something small and learn
>> from that. Don't do a controversial big patchset spanning multiple
>> subsystems, that's the hard way to learn things. First submit one patch
>> at a time to one subsystem and gain understanding of the process that
>> way.
>
> I actually thought this would be such simple thing.

If there are 22 patches and a dozen different subsystems it's far from
simple, as you noticed from your replies :)

> Do you know of any good thing where to start? I already looked into
> drivers/staging/*/TODO and didn't found something for me personally.

I work in wireless and one my annoyance is use of BUG_ON() in wireless
drivers. There just isn't a good reason to crash the whole system when
there's a bug in a wireless driver or firmware. You can get list like
this:

git grep BUG_ON drivers/net/wireless/ | grep -v BUILD_BUG_ON

It might not be always trivial to fix BUG_ON() usage, so it would be a
good challenge as well. See the wiki link below how to submit wireless
patches. But just send a one patch first, don't work for several hours
and then submit a big set of patches.

We also might have a todo list somewhere in the wiki, but don't know how
to up-to-date it is.

> Should I drop this patchset and start with something different? 

Like Mauro suggested, splitting the patchset per subsystem is a very
good idea. And first try out with one subsystem, and after seeing how it
goes (if they are accepted or rejected), decide if you send more patches
to other subsystems.

> If yes, what would the proper way to drop it? Just announcing, that
> this is going nowhere in a separate patch?

Replying to Mauro's email and telling your intentions is a good way to
inform everyone.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Kalle Valo]

Benjamin Stürz <benni@stuerz.xyz> writes:

> On 28.03.22 11:33, Kalle Valo wrote:
>> Benjamin Stürz <benni@stuerz.xyz> writes:
>> 
>>> This patch series replaces comments with C99's designated initializers
>>> in a few places. It also adds some enum initializers. This is my first
>>> time contributing to the Linux kernel, therefore I'm probably doing a
>>> lot of things the wrong way. I'm sorry for that.
>> 
>> Just a small tip: If you are new, start with something small and learn
>> from that. Don't do a controversial big patchset spanning multiple
>> subsystems, that's the hard way to learn things. First submit one patch
>> at a time to one subsystem and gain understanding of the process that
>> way.
>
> I actually thought this would be such simple thing.

If there are 22 patches and a dozen different subsystems it's far from
simple, as you noticed from your replies :)

> Do you know of any good thing where to start? I already looked into
> drivers/staging/*/TODO and didn't found something for me personally.

I work in wireless and one my annoyance is use of BUG_ON() in wireless
drivers. There just isn't a good reason to crash the whole system when
there's a bug in a wireless driver or firmware. You can get list like
this:

git grep BUG_ON drivers/net/wireless/ | grep -v BUILD_BUG_ON

It might not be always trivial to fix BUG_ON() usage, so it would be a
good challenge as well. See the wiki link below how to submit wireless
patches. But just send a one patch first, don't work for several hours
and then submit a big set of patches.

We also might have a todo list somewhere in the wiki, but don't know how
to up-to-date it is.

> Should I drop this patchset and start with something different? 

Like Mauro suggested, splitting the patchset per subsystem is a very
good idea. And first try out with one subsystem, and after seeing how it
goes (if they are accepted or rejected), decide if you send more patches
to other subsystems.

> If yes, what would the proper way to drop it? Just announcing, that
> this is going nowhere in a separate patch?

Replying to Mauro's email and telling your intentions is a good way to
inform everyone.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 00/22] Replace comments with C99 initializers

[Jakub Kicinski]

On Mon, 28 Mar 2022 13:51:42 +0200 Benjamin Stürz wrote:
> > Just a small tip: If you are new, start with something small and learn
> > from that. Don't do a controversial big patchset spanning multiple
> > subsystems, that's the hard way to learn things. First submit one patch
> > at a time to one subsystem and gain understanding of the process that
> > way.
> 
> I actually thought this would be such simple thing. Do you know of any
> good thing where to start? I already looked into drivers/staging/*/TODO
> and didn't found something for me personally.

FWIW on the netdev side there's work coming to convert a set of features
from unsigned long to a BITMAP which will require converting a lot of
drivers to an explicit helpers from direct access.

https://lore.kernel.org/all/20220324154932.17557-14-shenjian15@huawei.com/

If it seems interesting enough you can try reaching out to Jian Shen.

Re: [PATCH 00/22] Replace comments with C99 initializers

[Jakub Kicinski]

On Mon, 28 Mar 2022 13:51:42 +0200 Benjamin Stürz wrote:
> > Just a small tip: If you are new, start with something small and learn
> > from that. Don't do a controversial big patchset spanning multiple
> > subsystems, that's the hard way to learn things. First submit one patch
> > at a time to one subsystem and gain understanding of the process that
> > way.
> 
> I actually thought this would be such simple thing. Do you know of any
> good thing where to start? I already looked into drivers/staging/*/TODO
> and didn't found something for me personally.

FWIW on the netdev side there's work coming to convert a set of features
from unsigned long to a BITMAP which will require converting a lot of
drivers to an explicit helpers from direct access.

https://lore.kernel.org/all/20220324154932.17557-14-shenjian15@huawei.com/

If it seems interesting enough you can try reaching out to Jian Shen.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 00/22] Replace comments with C99 initializers

[Jakub Kicinski]

On Mon, 28 Mar 2022 13:51:42 +0200 Benjamin Stürz wrote:
> > Just a small tip: If you are new, start with something small and learn
> > from that. Don't do a controversial big patchset spanning multiple
> > subsystems, that's the hard way to learn things. First submit one patch
> > at a time to one subsystem and gain understanding of the process that
> > way.
> 
> I actually thought this would be such simple thing. Do you know of any
> good thing where to start? I already looked into drivers/staging/*/TODO
> and didn't found something for me personally.

FWIW on the netdev side there's work coming to convert a set of features
from unsigned long to a BITMAP which will require converting a lot of
drivers to an explicit helpers from direct access.

https://lore.kernel.org/all/20220324154932.17557-14-shenjian15@huawei.com/

If it seems interesting enough you can try reaching out to Jian Shen.

Re: [PATCH 00/22] Replace comments with C99 initializers

[Jakub Kicinski]

On Mon, 28 Mar 2022 13:51:42 +0200 Benjamin Stürz wrote:
> > Just a small tip: If you are new, start with something small and learn
> > from that. Don't do a controversial big patchset spanning multiple
> > subsystems, that's the hard way to learn things. First submit one patch
> > at a time to one subsystem and gain understanding of the process that
> > way.
> 
> I actually thought this would be such simple thing. Do you know of any
> good thing where to start? I already looked into drivers/staging/*/TODO
> and didn't found something for me personally.

FWIW on the netdev side there's work coming to convert a set of features
from unsigned long to a BITMAP which will require converting a lot of
drivers to an explicit helpers from direct access.

https://lore.kernel.org/all/20220324154932.17557-14-shenjian15@huawei.com/

If it seems interesting enough you can try reaching out to Jian Shen.

Re: [PATCH 00/22] Replace comments with C99 initializers

[Daniel Thompson]

On Sun, Mar 27, 2022 at 02:46:00PM +0200, Benjamin Stürz wrote:
> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Welcome!


> I've gotten a few emails so far stating that this patch series is
> unnecessary. Yes, in fact this patch series is not necessary by itself,
> but it could help me understand how the whole process works and maybe I
> could help somewhere, where help is actually needed.

Have you been told the series is unnecessary or too big?

Although all patches represent a variant of the same mechanical
transformation but they are mostly unrelated to each other and, if
accepted, they will be applied by many different people.

Taken as a whole presenting this to maintainers as a 22 patch set is too
big. I'd recommend starting with a smaller patch or patch series where
all the patches get picked up by the same maintainer.


> This patch itself is a no-op.

PATCH 0/XX is for the covering letter. You should generate a template for
it using the --cover-letter option of git format-patch. That way patch 0
will contain the diffstat for the whole series (which is often useful
to help understand what the series is for) and there is no need to
make no-op changes.


Daniel.

> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  .gitignore | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 7afd412dadd2..706f667261eb 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -20,7 +20,7 @@
>  *.dtb
>  *.dtbo
>  *.dtb.S
> -*.dwo
> +*.dwo
>  *.elf
>  *.gcno
>  *.gz
> -- 
> 2.35.1

Re: [PATCH 00/22] Replace comments with C99 initializers

[Daniel Thompson]

On Sun, Mar 27, 2022 at 02:46:00PM +0200, Benjamin Stürz wrote:
> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Welcome!


> I've gotten a few emails so far stating that this patch series is
> unnecessary. Yes, in fact this patch series is not necessary by itself,
> but it could help me understand how the whole process works and maybe I
> could help somewhere, where help is actually needed.

Have you been told the series is unnecessary or too big?

Although all patches represent a variant of the same mechanical
transformation but they are mostly unrelated to each other and, if
accepted, they will be applied by many different people.

Taken as a whole presenting this to maintainers as a 22 patch set is too
big. I'd recommend starting with a smaller patch or patch series where
all the patches get picked up by the same maintainer.


> This patch itself is a no-op.

PATCH 0/XX is for the covering letter. You should generate a template for
it using the --cover-letter option of git format-patch. That way patch 0
will contain the diffstat for the whole series (which is often useful
to help understand what the series is for) and there is no need to
make no-op changes.


Daniel.

> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  .gitignore | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 7afd412dadd2..706f667261eb 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -20,7 +20,7 @@
>  *.dtb
>  *.dtbo
>  *.dtb.S
> -*.dwo
> +*.dwo
>  *.elf
>  *.gcno
>  *.gz
> -- 
> 2.35.1

Re: [PATCH 00/22] Replace comments with C99 initializers

[Daniel Thompson]

On Sun, Mar 27, 2022 at 02:46:00PM +0200, Benjamin Stürz wrote:
> This patch series replaces comments with C99's designated initializers
> in a few places. It also adds some enum initializers. This is my first
> time contributing to the Linux kernel, therefore I'm probably doing a
> lot of things the wrong way. I'm sorry for that.

Welcome!


> I've gotten a few emails so far stating that this patch series is
> unnecessary. Yes, in fact this patch series is not necessary by itself,
> but it could help me understand how the whole process works and maybe I
> could help somewhere, where help is actually needed.

Have you been told the series is unnecessary or too big?

Although all patches represent a variant of the same mechanical
transformation but they are mostly unrelated to each other and, if
accepted, they will be applied by many different people.

Taken as a whole presenting this to maintainers as a 22 patch set is too
big. I'd recommend starting with a smaller patch or patch series where
all the patches get picked up by the same maintainer.


> This patch itself is a no-op.

PATCH 0/XX is for the covering letter. You should generate a template for
it using the --cover-letter option of git format-patch. That way patch 0
will contain the diffstat for the whole series (which is often useful
to help understand what the series is for) and there is no need to
make no-op changes.


Daniel.

> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  .gitignore | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 7afd412dadd2..706f667261eb 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -20,7 +20,7 @@
>  *.dtb
>  *.dtbo
>  *.dtb.S
> -*.dwo
> +*.dwo
>  *.elf
>  *.gcno
>  *.gz
> -- 
> 2.35.1

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:48PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

This commit description seems wrong to me. This patch doesn't include
use C99 designated initializers (or AFAICT any other language feature
that has recently been enabled in the kernel).

The changes here are just plain constant-expressions in enumeration
lists and were included in C89/C90.


Daniel.


> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  
> -- 
> 2.35.1
> 

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:48PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

This commit description seems wrong to me. This patch doesn't include
use C99 designated initializers (or AFAICT any other language feature
that has recently been enabled in the kernel).

The changes here are just plain constant-expressions in enumeration
lists and were included in C89/C90.


Daniel.


> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  
> -- 
> 2.35.1
> 

Re: [PATCH 01/22] orion5x: Replace comments with C99 initializers

[Daniel Thompson]

On Sat, Mar 26, 2022 at 05:58:48PM +0100, Benjamin Stürz wrote:
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

This commit description seems wrong to me. This patch doesn't include
use C99 designated initializers (or AFAICT any other language feature
that has recently been enabled in the kernel).

The changes here are just plain constant-expressions in enumeration
lists and were included in C89/C90.


Daniel.


> 
> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 87cb47220e82..d762248c6512 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -61,9 +61,9 @@
>  
>  /* Exposed to userspace, do not change */
>  enum {
> -	DNS323_REV_A1,	/* 0 */
> -	DNS323_REV_B1,	/* 1 */
> -	DNS323_REV_C1,	/* 2 */
> +	DNS323_REV_A1 = 0,
> +	DNS323_REV_B1 = 1,
> +	DNS323_REV_C1 = 2,
>  };
>  
>  
> -- 
> 2.35.1
> 

[Devel] Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Rafael J. Wysocki]

[-- Attachment #1: Type: text/plain, Size: 8922 bytes --]

On Sat, Mar 26, 2022 at 6:09 PM Benjamin Stürz <benni(a)stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

However, note that all of the ACPICA material should be submitted to
the upstream ACPICA project via https://github.com/acpica/acpica

Also please note that the set of compilers that need to be supported
by the ACPICA project is greater than the set of compilers that can
build the Linux kernel.


> Signed-off-by: Benjamin Stürz <benni(a)stuerz.xyz>
> ---
>  drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
>  1 file changed, 90 insertions(+), 93 deletions(-)
>
> diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
> index bcd3871079d7..d19868d2ea46 100644
> --- a/drivers/acpi/acpica/utdecode.c
> +++ b/drivers/acpi/acpica/utdecode.c
> @@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
>  /* Printable names of the ACPI object types */
>
>  static const char *acpi_gbl_ns_type_names[] = {
> -       /* 00 */ "Untyped",
> -       /* 01 */ "Integer",
> -       /* 02 */ "String",
> -       /* 03 */ "Buffer",
> -       /* 04 */ "Package",
> -       /* 05 */ "FieldUnit",
> -       /* 06 */ "Device",
> -       /* 07 */ "Event",
> -       /* 08 */ "Method",
> -       /* 09 */ "Mutex",
> -       /* 10 */ "Region",
> -       /* 11 */ "Power",
> -       /* 12 */ "Processor",
> -       /* 13 */ "Thermal",
> -       /* 14 */ "BufferField",
> -       /* 15 */ "DdbHandle",
> -       /* 16 */ "DebugObject",
> -       /* 17 */ "RegionField",
> -       /* 18 */ "BankField",
> -       /* 19 */ "IndexField",
> -       /* 20 */ "Reference",
> -       /* 21 */ "Alias",
> -       /* 22 */ "MethodAlias",
> -       /* 23 */ "Notify",
> -       /* 24 */ "AddrHandler",
> -       /* 25 */ "ResourceDesc",
> -       /* 26 */ "ResourceFld",
> -       /* 27 */ "Scope",
> -       /* 28 */ "Extra",
> -       /* 29 */ "Data",
> -       /* 30 */ "Invalid"
> +       [0]  = "Untyped",
> +       [1]  = "Integer",
> +       [2]  = "String",
> +       [3]  = "Buffer",
> +       [4]  = "Package",
> +       [5]  = "FieldUnit",
> +       [6]  = "Device",
> +       [7]  = "Event",
> +       [8]  = "Method",
> +       [9]  = "Mutex",
> +       [10] = "Region",
> +       [11] = "Power",
> +       [12] = "Processor",
> +       [13] = "Thermal",
> +       [14] = "BufferField",
> +       [15] = "DdbHandle",
> +       [16] = "DebugObject",
> +       [17] = "RegionField",
> +       [18] = "BankField",
> +       [19] = "IndexField",
> +       [20] = "Reference",
> +       [21] = "Alias",
> +       [22] = "MethodAlias",
> +       [23] = "Notify",
> +       [24] = "AddrHandler",
> +       [25] = "ResourceDesc",
> +       [26] = "ResourceFld",
> +       [27] = "Scope",
> +       [28] = "Extra",
> +       [29] = "Data",
> +       [30] = "Invalid"
>  };
>
>  const char *acpi_ut_get_type_name(acpi_object_type type)
> @@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
>  /* Printable names of object descriptor types */
>
>  static const char *acpi_gbl_desc_type_names[] = {
> -       /* 00 */ "Not a Descriptor",
> -       /* 01 */ "Cached Object",
> -       /* 02 */ "State-Generic",
> -       /* 03 */ "State-Update",
> -       /* 04 */ "State-Package",
> -       /* 05 */ "State-Control",
> -       /* 06 */ "State-RootParseScope",
> -       /* 07 */ "State-ParseScope",
> -       /* 08 */ "State-WalkScope",
> -       /* 09 */ "State-Result",
> -       /* 10 */ "State-Notify",
> -       /* 11 */ "State-Thread",
> -       /* 12 */ "Tree Walk State",
> -       /* 13 */ "Parse Tree Op",
> -       /* 14 */ "Operand Object",
> -       /* 15 */ "Namespace Node"
> +       [0]  = "Not a Descriptor",
> +       [1]  = "Cached Object",
> +       [2]  = "State-Generic",
> +       [3]  = "State-Update",
> +       [4]  = "State-Package",
> +       [5]  = "State-Control",
> +       [6]  = "State-RootParseScope",
> +       [7]  = "State-ParseScope",
> +       [8]  = "State-WalkScope",
> +       [9]  = "State-Result",
> +       [10] = "State-Notify",
> +       [11] = "State-Thread",
> +       [12] = "Tree Walk State",
> +       [13] = "Parse Tree Op",
> +       [14] = "Operand Object",
> +       [15] = "Namespace Node"
>  };
>
>  const char *acpi_ut_get_descriptor_name(void *object)
> @@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
>  /* Printable names of reference object sub-types */
>
>  static const char *acpi_gbl_ref_class_names[] = {
> -       /* 00 */ "Local",
> -       /* 01 */ "Argument",
> -       /* 02 */ "RefOf",
> -       /* 03 */ "Index",
> -       /* 04 */ "DdbHandle",
> -       /* 05 */ "Named Object",
> -       /* 06 */ "Debug"
> +       [0] = "Local",
> +       [1] = "Argument",
> +       [2] = "RefOf",
> +       [3] = "Index",
> +       [4] = "DdbHandle",
> +       [5] = "Named Object",
> +       [6] = "Debug"
>  };
>
>  const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
> @@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
>  /* Names for Notify() values, used for debug output */
>
>  static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
> -       /* 00 */ "Bus Check",
> -       /* 01 */ "Device Check",
> -       /* 02 */ "Device Wake",
> -       /* 03 */ "Eject Request",
> -       /* 04 */ "Device Check Light",
> -       /* 05 */ "Frequency Mismatch",
> -       /* 06 */ "Bus Mode Mismatch",
> -       /* 07 */ "Power Fault",
> -       /* 08 */ "Capabilities Check",
> -       /* 09 */ "Device PLD Check",
> -       /* 0A */ "Reserved",
> -       /* 0B */ "System Locality Update",
> -                                                               /* 0C */ "Reserved (was previously Shutdown Request)",
> -                                                               /* Reserved in ACPI 6.0 */
> -       /* 0D */ "System Resource Affinity Update",
> -                                                               /* 0E */ "Heterogeneous Memory Attributes Update",
> -                                                               /* ACPI 6.2 */
> -                                               /* 0F */ "Error Disconnect Recover"
> -                                               /* ACPI 6.3 */
> +       [0]  = "Bus Check",
> +       [1]  = "Device Check",
> +       [2]  = "Device Wake",
> +       [3]  = "Eject Request",
> +       [4]  = "Device Check Light",
> +       [5]  = "Frequency Mismatch",
> +       [6]  = "Bus Mode Mismatch",
> +       [7]  = "Power Fault",
> +       [8]  = "Capabilities Check",
> +       [9]  = "Device PLD Check",
> +       [10] = "Reserved",
> +       [11] = "System Locality Update",
> +       [12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
> +       [13] = "System Resource Affinity Update",
> +       [14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
> +       [15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
>  };
>
>  static const char *acpi_gbl_device_notify[5] = {
> @@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
>   ******************************************************************************/
>
>  static const char *acpi_gbl_argument_type[20] = {
> -       /* 00 */ "Unknown ARGP",
> -       /* 01 */ "ByteData",
> -       /* 02 */ "ByteList",
> -       /* 03 */ "CharList",
> -       /* 04 */ "DataObject",
> -       /* 05 */ "DataObjectList",
> -       /* 06 */ "DWordData",
> -       /* 07 */ "FieldList",
> -       /* 08 */ "Name",
> -       /* 09 */ "NameString",
> -       /* 0A */ "ObjectList",
> -       /* 0B */ "PackageLength",
> -       /* 0C */ "SuperName",
> -       /* 0D */ "Target",
> -       /* 0E */ "TermArg",
> -       /* 0F */ "TermList",
> -       /* 10 */ "WordData",
> -       /* 11 */ "QWordData",
> -       /* 12 */ "SimpleName",
> -       /* 13 */ "NameOrRef"
> +       [0x00] = "Unknown ARGP",
> +       [0x01] = "ByteData",
> +       [0x02] = "ByteList",
> +       [0x03] = "CharList",
> +       [0x04] = "DataObject",
> +       [0x05] = "DataObjectList",
> +       [0x06] = "DWordData",
> +       [0x07] = "FieldList",
> +       [0x08] = "Name",
> +       [0x09] = "NameString",
> +       [0x0A] = "ObjectList",
> +       [0x0B] = "PackageLength",
> +       [0x0C] = "SuperName",
> +       [0x0D] = "Target",
> +       [0x0E] = "TermArg",
> +       [0x0F] = "TermList",
> +       [0x10] = "WordData",
> +       [0x11] = "QWordData",
> +       [0x12] = "SimpleName",
> +       [0x13] = "NameOrRef"
>  };
>
>  const char *acpi_ut_get_argument_type_name(u32 arg_type)
> --
> 2.35.1
>

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Rafael J. Wysocki]

On Sat, Mar 26, 2022 at 6:09 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

However, note that all of the ACPICA material should be submitted to
the upstream ACPICA project via https://github.com/acpica/acpica

Also please note that the set of compilers that need to be supported
by the ACPICA project is greater than the set of compilers that can
build the Linux kernel.


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
>  1 file changed, 90 insertions(+), 93 deletions(-)
>
> diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
> index bcd3871079d7..d19868d2ea46 100644
> --- a/drivers/acpi/acpica/utdecode.c
> +++ b/drivers/acpi/acpica/utdecode.c
> @@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
>  /* Printable names of the ACPI object types */
>
>  static const char *acpi_gbl_ns_type_names[] = {
> -       /* 00 */ "Untyped",
> -       /* 01 */ "Integer",
> -       /* 02 */ "String",
> -       /* 03 */ "Buffer",
> -       /* 04 */ "Package",
> -       /* 05 */ "FieldUnit",
> -       /* 06 */ "Device",
> -       /* 07 */ "Event",
> -       /* 08 */ "Method",
> -       /* 09 */ "Mutex",
> -       /* 10 */ "Region",
> -       /* 11 */ "Power",
> -       /* 12 */ "Processor",
> -       /* 13 */ "Thermal",
> -       /* 14 */ "BufferField",
> -       /* 15 */ "DdbHandle",
> -       /* 16 */ "DebugObject",
> -       /* 17 */ "RegionField",
> -       /* 18 */ "BankField",
> -       /* 19 */ "IndexField",
> -       /* 20 */ "Reference",
> -       /* 21 */ "Alias",
> -       /* 22 */ "MethodAlias",
> -       /* 23 */ "Notify",
> -       /* 24 */ "AddrHandler",
> -       /* 25 */ "ResourceDesc",
> -       /* 26 */ "ResourceFld",
> -       /* 27 */ "Scope",
> -       /* 28 */ "Extra",
> -       /* 29 */ "Data",
> -       /* 30 */ "Invalid"
> +       [0]  = "Untyped",
> +       [1]  = "Integer",
> +       [2]  = "String",
> +       [3]  = "Buffer",
> +       [4]  = "Package",
> +       [5]  = "FieldUnit",
> +       [6]  = "Device",
> +       [7]  = "Event",
> +       [8]  = "Method",
> +       [9]  = "Mutex",
> +       [10] = "Region",
> +       [11] = "Power",
> +       [12] = "Processor",
> +       [13] = "Thermal",
> +       [14] = "BufferField",
> +       [15] = "DdbHandle",
> +       [16] = "DebugObject",
> +       [17] = "RegionField",
> +       [18] = "BankField",
> +       [19] = "IndexField",
> +       [20] = "Reference",
> +       [21] = "Alias",
> +       [22] = "MethodAlias",
> +       [23] = "Notify",
> +       [24] = "AddrHandler",
> +       [25] = "ResourceDesc",
> +       [26] = "ResourceFld",
> +       [27] = "Scope",
> +       [28] = "Extra",
> +       [29] = "Data",
> +       [30] = "Invalid"
>  };
>
>  const char *acpi_ut_get_type_name(acpi_object_type type)
> @@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
>  /* Printable names of object descriptor types */
>
>  static const char *acpi_gbl_desc_type_names[] = {
> -       /* 00 */ "Not a Descriptor",
> -       /* 01 */ "Cached Object",
> -       /* 02 */ "State-Generic",
> -       /* 03 */ "State-Update",
> -       /* 04 */ "State-Package",
> -       /* 05 */ "State-Control",
> -       /* 06 */ "State-RootParseScope",
> -       /* 07 */ "State-ParseScope",
> -       /* 08 */ "State-WalkScope",
> -       /* 09 */ "State-Result",
> -       /* 10 */ "State-Notify",
> -       /* 11 */ "State-Thread",
> -       /* 12 */ "Tree Walk State",
> -       /* 13 */ "Parse Tree Op",
> -       /* 14 */ "Operand Object",
> -       /* 15 */ "Namespace Node"
> +       [0]  = "Not a Descriptor",
> +       [1]  = "Cached Object",
> +       [2]  = "State-Generic",
> +       [3]  = "State-Update",
> +       [4]  = "State-Package",
> +       [5]  = "State-Control",
> +       [6]  = "State-RootParseScope",
> +       [7]  = "State-ParseScope",
> +       [8]  = "State-WalkScope",
> +       [9]  = "State-Result",
> +       [10] = "State-Notify",
> +       [11] = "State-Thread",
> +       [12] = "Tree Walk State",
> +       [13] = "Parse Tree Op",
> +       [14] = "Operand Object",
> +       [15] = "Namespace Node"
>  };
>
>  const char *acpi_ut_get_descriptor_name(void *object)
> @@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
>  /* Printable names of reference object sub-types */
>
>  static const char *acpi_gbl_ref_class_names[] = {
> -       /* 00 */ "Local",
> -       /* 01 */ "Argument",
> -       /* 02 */ "RefOf",
> -       /* 03 */ "Index",
> -       /* 04 */ "DdbHandle",
> -       /* 05 */ "Named Object",
> -       /* 06 */ "Debug"
> +       [0] = "Local",
> +       [1] = "Argument",
> +       [2] = "RefOf",
> +       [3] = "Index",
> +       [4] = "DdbHandle",
> +       [5] = "Named Object",
> +       [6] = "Debug"
>  };
>
>  const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
> @@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
>  /* Names for Notify() values, used for debug output */
>
>  static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
> -       /* 00 */ "Bus Check",
> -       /* 01 */ "Device Check",
> -       /* 02 */ "Device Wake",
> -       /* 03 */ "Eject Request",
> -       /* 04 */ "Device Check Light",
> -       /* 05 */ "Frequency Mismatch",
> -       /* 06 */ "Bus Mode Mismatch",
> -       /* 07 */ "Power Fault",
> -       /* 08 */ "Capabilities Check",
> -       /* 09 */ "Device PLD Check",
> -       /* 0A */ "Reserved",
> -       /* 0B */ "System Locality Update",
> -                                                               /* 0C */ "Reserved (was previously Shutdown Request)",
> -                                                               /* Reserved in ACPI 6.0 */
> -       /* 0D */ "System Resource Affinity Update",
> -                                                               /* 0E */ "Heterogeneous Memory Attributes Update",
> -                                                               /* ACPI 6.2 */
> -                                               /* 0F */ "Error Disconnect Recover"
> -                                               /* ACPI 6.3 */
> +       [0]  = "Bus Check",
> +       [1]  = "Device Check",
> +       [2]  = "Device Wake",
> +       [3]  = "Eject Request",
> +       [4]  = "Device Check Light",
> +       [5]  = "Frequency Mismatch",
> +       [6]  = "Bus Mode Mismatch",
> +       [7]  = "Power Fault",
> +       [8]  = "Capabilities Check",
> +       [9]  = "Device PLD Check",
> +       [10] = "Reserved",
> +       [11] = "System Locality Update",
> +       [12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
> +       [13] = "System Resource Affinity Update",
> +       [14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
> +       [15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
>  };
>
>  static const char *acpi_gbl_device_notify[5] = {
> @@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
>   ******************************************************************************/
>
>  static const char *acpi_gbl_argument_type[20] = {
> -       /* 00 */ "Unknown ARGP",
> -       /* 01 */ "ByteData",
> -       /* 02 */ "ByteList",
> -       /* 03 */ "CharList",
> -       /* 04 */ "DataObject",
> -       /* 05 */ "DataObjectList",
> -       /* 06 */ "DWordData",
> -       /* 07 */ "FieldList",
> -       /* 08 */ "Name",
> -       /* 09 */ "NameString",
> -       /* 0A */ "ObjectList",
> -       /* 0B */ "PackageLength",
> -       /* 0C */ "SuperName",
> -       /* 0D */ "Target",
> -       /* 0E */ "TermArg",
> -       /* 0F */ "TermList",
> -       /* 10 */ "WordData",
> -       /* 11 */ "QWordData",
> -       /* 12 */ "SimpleName",
> -       /* 13 */ "NameOrRef"
> +       [0x00] = "Unknown ARGP",
> +       [0x01] = "ByteData",
> +       [0x02] = "ByteList",
> +       [0x03] = "CharList",
> +       [0x04] = "DataObject",
> +       [0x05] = "DataObjectList",
> +       [0x06] = "DWordData",
> +       [0x07] = "FieldList",
> +       [0x08] = "Name",
> +       [0x09] = "NameString",
> +       [0x0A] = "ObjectList",
> +       [0x0B] = "PackageLength",
> +       [0x0C] = "SuperName",
> +       [0x0D] = "Target",
> +       [0x0E] = "TermArg",
> +       [0x0F] = "TermList",
> +       [0x10] = "WordData",
> +       [0x11] = "QWordData",
> +       [0x12] = "SimpleName",
> +       [0x13] = "NameOrRef"
>  };
>
>  const char *acpi_ut_get_argument_type_name(u32 arg_type)
> --
> 2.35.1
>

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Rafael J. Wysocki]

On Sat, Mar 26, 2022 at 6:09 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

However, note that all of the ACPICA material should be submitted to
the upstream ACPICA project via https://github.com/acpica/acpica

Also please note that the set of compilers that need to be supported
by the ACPICA project is greater than the set of compilers that can
build the Linux kernel.


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
>  1 file changed, 90 insertions(+), 93 deletions(-)
>
> diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
> index bcd3871079d7..d19868d2ea46 100644
> --- a/drivers/acpi/acpica/utdecode.c
> +++ b/drivers/acpi/acpica/utdecode.c
> @@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
>  /* Printable names of the ACPI object types */
>
>  static const char *acpi_gbl_ns_type_names[] = {
> -       /* 00 */ "Untyped",
> -       /* 01 */ "Integer",
> -       /* 02 */ "String",
> -       /* 03 */ "Buffer",
> -       /* 04 */ "Package",
> -       /* 05 */ "FieldUnit",
> -       /* 06 */ "Device",
> -       /* 07 */ "Event",
> -       /* 08 */ "Method",
> -       /* 09 */ "Mutex",
> -       /* 10 */ "Region",
> -       /* 11 */ "Power",
> -       /* 12 */ "Processor",
> -       /* 13 */ "Thermal",
> -       /* 14 */ "BufferField",
> -       /* 15 */ "DdbHandle",
> -       /* 16 */ "DebugObject",
> -       /* 17 */ "RegionField",
> -       /* 18 */ "BankField",
> -       /* 19 */ "IndexField",
> -       /* 20 */ "Reference",
> -       /* 21 */ "Alias",
> -       /* 22 */ "MethodAlias",
> -       /* 23 */ "Notify",
> -       /* 24 */ "AddrHandler",
> -       /* 25 */ "ResourceDesc",
> -       /* 26 */ "ResourceFld",
> -       /* 27 */ "Scope",
> -       /* 28 */ "Extra",
> -       /* 29 */ "Data",
> -       /* 30 */ "Invalid"
> +       [0]  = "Untyped",
> +       [1]  = "Integer",
> +       [2]  = "String",
> +       [3]  = "Buffer",
> +       [4]  = "Package",
> +       [5]  = "FieldUnit",
> +       [6]  = "Device",
> +       [7]  = "Event",
> +       [8]  = "Method",
> +       [9]  = "Mutex",
> +       [10] = "Region",
> +       [11] = "Power",
> +       [12] = "Processor",
> +       [13] = "Thermal",
> +       [14] = "BufferField",
> +       [15] = "DdbHandle",
> +       [16] = "DebugObject",
> +       [17] = "RegionField",
> +       [18] = "BankField",
> +       [19] = "IndexField",
> +       [20] = "Reference",
> +       [21] = "Alias",
> +       [22] = "MethodAlias",
> +       [23] = "Notify",
> +       [24] = "AddrHandler",
> +       [25] = "ResourceDesc",
> +       [26] = "ResourceFld",
> +       [27] = "Scope",
> +       [28] = "Extra",
> +       [29] = "Data",
> +       [30] = "Invalid"
>  };
>
>  const char *acpi_ut_get_type_name(acpi_object_type type)
> @@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
>  /* Printable names of object descriptor types */
>
>  static const char *acpi_gbl_desc_type_names[] = {
> -       /* 00 */ "Not a Descriptor",
> -       /* 01 */ "Cached Object",
> -       /* 02 */ "State-Generic",
> -       /* 03 */ "State-Update",
> -       /* 04 */ "State-Package",
> -       /* 05 */ "State-Control",
> -       /* 06 */ "State-RootParseScope",
> -       /* 07 */ "State-ParseScope",
> -       /* 08 */ "State-WalkScope",
> -       /* 09 */ "State-Result",
> -       /* 10 */ "State-Notify",
> -       /* 11 */ "State-Thread",
> -       /* 12 */ "Tree Walk State",
> -       /* 13 */ "Parse Tree Op",
> -       /* 14 */ "Operand Object",
> -       /* 15 */ "Namespace Node"
> +       [0]  = "Not a Descriptor",
> +       [1]  = "Cached Object",
> +       [2]  = "State-Generic",
> +       [3]  = "State-Update",
> +       [4]  = "State-Package",
> +       [5]  = "State-Control",
> +       [6]  = "State-RootParseScope",
> +       [7]  = "State-ParseScope",
> +       [8]  = "State-WalkScope",
> +       [9]  = "State-Result",
> +       [10] = "State-Notify",
> +       [11] = "State-Thread",
> +       [12] = "Tree Walk State",
> +       [13] = "Parse Tree Op",
> +       [14] = "Operand Object",
> +       [15] = "Namespace Node"
>  };
>
>  const char *acpi_ut_get_descriptor_name(void *object)
> @@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
>  /* Printable names of reference object sub-types */
>
>  static const char *acpi_gbl_ref_class_names[] = {
> -       /* 00 */ "Local",
> -       /* 01 */ "Argument",
> -       /* 02 */ "RefOf",
> -       /* 03 */ "Index",
> -       /* 04 */ "DdbHandle",
> -       /* 05 */ "Named Object",
> -       /* 06 */ "Debug"
> +       [0] = "Local",
> +       [1] = "Argument",
> +       [2] = "RefOf",
> +       [3] = "Index",
> +       [4] = "DdbHandle",
> +       [5] = "Named Object",
> +       [6] = "Debug"
>  };
>
>  const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
> @@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
>  /* Names for Notify() values, used for debug output */
>
>  static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
> -       /* 00 */ "Bus Check",
> -       /* 01 */ "Device Check",
> -       /* 02 */ "Device Wake",
> -       /* 03 */ "Eject Request",
> -       /* 04 */ "Device Check Light",
> -       /* 05 */ "Frequency Mismatch",
> -       /* 06 */ "Bus Mode Mismatch",
> -       /* 07 */ "Power Fault",
> -       /* 08 */ "Capabilities Check",
> -       /* 09 */ "Device PLD Check",
> -       /* 0A */ "Reserved",
> -       /* 0B */ "System Locality Update",
> -                                                               /* 0C */ "Reserved (was previously Shutdown Request)",
> -                                                               /* Reserved in ACPI 6.0 */
> -       /* 0D */ "System Resource Affinity Update",
> -                                                               /* 0E */ "Heterogeneous Memory Attributes Update",
> -                                                               /* ACPI 6.2 */
> -                                               /* 0F */ "Error Disconnect Recover"
> -                                               /* ACPI 6.3 */
> +       [0]  = "Bus Check",
> +       [1]  = "Device Check",
> +       [2]  = "Device Wake",
> +       [3]  = "Eject Request",
> +       [4]  = "Device Check Light",
> +       [5]  = "Frequency Mismatch",
> +       [6]  = "Bus Mode Mismatch",
> +       [7]  = "Power Fault",
> +       [8]  = "Capabilities Check",
> +       [9]  = "Device PLD Check",
> +       [10] = "Reserved",
> +       [11] = "System Locality Update",
> +       [12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
> +       [13] = "System Resource Affinity Update",
> +       [14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
> +       [15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
>  };
>
>  static const char *acpi_gbl_device_notify[5] = {
> @@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
>   ******************************************************************************/
>
>  static const char *acpi_gbl_argument_type[20] = {
> -       /* 00 */ "Unknown ARGP",
> -       /* 01 */ "ByteData",
> -       /* 02 */ "ByteList",
> -       /* 03 */ "CharList",
> -       /* 04 */ "DataObject",
> -       /* 05 */ "DataObjectList",
> -       /* 06 */ "DWordData",
> -       /* 07 */ "FieldList",
> -       /* 08 */ "Name",
> -       /* 09 */ "NameString",
> -       /* 0A */ "ObjectList",
> -       /* 0B */ "PackageLength",
> -       /* 0C */ "SuperName",
> -       /* 0D */ "Target",
> -       /* 0E */ "TermArg",
> -       /* 0F */ "TermList",
> -       /* 10 */ "WordData",
> -       /* 11 */ "QWordData",
> -       /* 12 */ "SimpleName",
> -       /* 13 */ "NameOrRef"
> +       [0x00] = "Unknown ARGP",
> +       [0x01] = "ByteData",
> +       [0x02] = "ByteList",
> +       [0x03] = "CharList",
> +       [0x04] = "DataObject",
> +       [0x05] = "DataObjectList",
> +       [0x06] = "DWordData",
> +       [0x07] = "FieldList",
> +       [0x08] = "Name",
> +       [0x09] = "NameString",
> +       [0x0A] = "ObjectList",
> +       [0x0B] = "PackageLength",
> +       [0x0C] = "SuperName",
> +       [0x0D] = "Target",
> +       [0x0E] = "TermArg",
> +       [0x0F] = "TermList",
> +       [0x10] = "WordData",
> +       [0x11] = "QWordData",
> +       [0x12] = "SimpleName",
> +       [0x13] = "NameOrRef"
>  };
>
>  const char *acpi_ut_get_argument_type_name(u32 arg_type)
> --
> 2.35.1
>

Re: [PATCH 05/22] acpica: Replace comments with C99 initializers

[Rafael J. Wysocki]

On Sat, Mar 26, 2022 at 6:09 PM Benjamin Stürz <benni@stuerz.xyz> wrote:
>
> This replaces comments with C99's designated
> initializers because the kernel supports them now.

However, note that all of the ACPICA material should be submitted to
the upstream ACPICA project via https://github.com/acpica/acpica

Also please note that the set of compilers that need to be supported
by the ACPICA project is greater than the set of compilers that can
build the Linux kernel.


> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> ---
>  drivers/acpi/acpica/utdecode.c | 183 ++++++++++++++++-----------------
>  1 file changed, 90 insertions(+), 93 deletions(-)
>
> diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
> index bcd3871079d7..d19868d2ea46 100644
> --- a/drivers/acpi/acpica/utdecode.c
> +++ b/drivers/acpi/acpica/utdecode.c
> @@ -156,37 +156,37 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
>  /* Printable names of the ACPI object types */
>
>  static const char *acpi_gbl_ns_type_names[] = {
> -       /* 00 */ "Untyped",
> -       /* 01 */ "Integer",
> -       /* 02 */ "String",
> -       /* 03 */ "Buffer",
> -       /* 04 */ "Package",
> -       /* 05 */ "FieldUnit",
> -       /* 06 */ "Device",
> -       /* 07 */ "Event",
> -       /* 08 */ "Method",
> -       /* 09 */ "Mutex",
> -       /* 10 */ "Region",
> -       /* 11 */ "Power",
> -       /* 12 */ "Processor",
> -       /* 13 */ "Thermal",
> -       /* 14 */ "BufferField",
> -       /* 15 */ "DdbHandle",
> -       /* 16 */ "DebugObject",
> -       /* 17 */ "RegionField",
> -       /* 18 */ "BankField",
> -       /* 19 */ "IndexField",
> -       /* 20 */ "Reference",
> -       /* 21 */ "Alias",
> -       /* 22 */ "MethodAlias",
> -       /* 23 */ "Notify",
> -       /* 24 */ "AddrHandler",
> -       /* 25 */ "ResourceDesc",
> -       /* 26 */ "ResourceFld",
> -       /* 27 */ "Scope",
> -       /* 28 */ "Extra",
> -       /* 29 */ "Data",
> -       /* 30 */ "Invalid"
> +       [0]  = "Untyped",
> +       [1]  = "Integer",
> +       [2]  = "String",
> +       [3]  = "Buffer",
> +       [4]  = "Package",
> +       [5]  = "FieldUnit",
> +       [6]  = "Device",
> +       [7]  = "Event",
> +       [8]  = "Method",
> +       [9]  = "Mutex",
> +       [10] = "Region",
> +       [11] = "Power",
> +       [12] = "Processor",
> +       [13] = "Thermal",
> +       [14] = "BufferField",
> +       [15] = "DdbHandle",
> +       [16] = "DebugObject",
> +       [17] = "RegionField",
> +       [18] = "BankField",
> +       [19] = "IndexField",
> +       [20] = "Reference",
> +       [21] = "Alias",
> +       [22] = "MethodAlias",
> +       [23] = "Notify",
> +       [24] = "AddrHandler",
> +       [25] = "ResourceDesc",
> +       [26] = "ResourceFld",
> +       [27] = "Scope",
> +       [28] = "Extra",
> +       [29] = "Data",
> +       [30] = "Invalid"
>  };
>
>  const char *acpi_ut_get_type_name(acpi_object_type type)
> @@ -284,22 +284,22 @@ const char *acpi_ut_get_node_name(void *object)
>  /* Printable names of object descriptor types */
>
>  static const char *acpi_gbl_desc_type_names[] = {
> -       /* 00 */ "Not a Descriptor",
> -       /* 01 */ "Cached Object",
> -       /* 02 */ "State-Generic",
> -       /* 03 */ "State-Update",
> -       /* 04 */ "State-Package",
> -       /* 05 */ "State-Control",
> -       /* 06 */ "State-RootParseScope",
> -       /* 07 */ "State-ParseScope",
> -       /* 08 */ "State-WalkScope",
> -       /* 09 */ "State-Result",
> -       /* 10 */ "State-Notify",
> -       /* 11 */ "State-Thread",
> -       /* 12 */ "Tree Walk State",
> -       /* 13 */ "Parse Tree Op",
> -       /* 14 */ "Operand Object",
> -       /* 15 */ "Namespace Node"
> +       [0]  = "Not a Descriptor",
> +       [1]  = "Cached Object",
> +       [2]  = "State-Generic",
> +       [3]  = "State-Update",
> +       [4]  = "State-Package",
> +       [5]  = "State-Control",
> +       [6]  = "State-RootParseScope",
> +       [7]  = "State-ParseScope",
> +       [8]  = "State-WalkScope",
> +       [9]  = "State-Result",
> +       [10] = "State-Notify",
> +       [11] = "State-Thread",
> +       [12] = "Tree Walk State",
> +       [13] = "Parse Tree Op",
> +       [14] = "Operand Object",
> +       [15] = "Namespace Node"
>  };
>
>  const char *acpi_ut_get_descriptor_name(void *object)
> @@ -331,13 +331,13 @@ const char *acpi_ut_get_descriptor_name(void *object)
>  /* Printable names of reference object sub-types */
>
>  static const char *acpi_gbl_ref_class_names[] = {
> -       /* 00 */ "Local",
> -       /* 01 */ "Argument",
> -       /* 02 */ "RefOf",
> -       /* 03 */ "Index",
> -       /* 04 */ "DdbHandle",
> -       /* 05 */ "Named Object",
> -       /* 06 */ "Debug"
> +       [0] = "Local",
> +       [1] = "Argument",
> +       [2] = "RefOf",
> +       [3] = "Index",
> +       [4] = "DdbHandle",
> +       [5] = "Named Object",
> +       [6] = "Debug"
>  };
>
>  const char *acpi_ut_get_reference_name(union acpi_operand_object *object)
> @@ -416,25 +416,22 @@ const char *acpi_ut_get_mutex_name(u32 mutex_id)
>  /* Names for Notify() values, used for debug output */
>
>  static const char *acpi_gbl_generic_notify[ACPI_GENERIC_NOTIFY_MAX + 1] = {
> -       /* 00 */ "Bus Check",
> -       /* 01 */ "Device Check",
> -       /* 02 */ "Device Wake",
> -       /* 03 */ "Eject Request",
> -       /* 04 */ "Device Check Light",
> -       /* 05 */ "Frequency Mismatch",
> -       /* 06 */ "Bus Mode Mismatch",
> -       /* 07 */ "Power Fault",
> -       /* 08 */ "Capabilities Check",
> -       /* 09 */ "Device PLD Check",
> -       /* 0A */ "Reserved",
> -       /* 0B */ "System Locality Update",
> -                                                               /* 0C */ "Reserved (was previously Shutdown Request)",
> -                                                               /* Reserved in ACPI 6.0 */
> -       /* 0D */ "System Resource Affinity Update",
> -                                                               /* 0E */ "Heterogeneous Memory Attributes Update",
> -                                                               /* ACPI 6.2 */
> -                                               /* 0F */ "Error Disconnect Recover"
> -                                               /* ACPI 6.3 */
> +       [0]  = "Bus Check",
> +       [1]  = "Device Check",
> +       [2]  = "Device Wake",
> +       [3]  = "Eject Request",
> +       [4]  = "Device Check Light",
> +       [5]  = "Frequency Mismatch",
> +       [6]  = "Bus Mode Mismatch",
> +       [7]  = "Power Fault",
> +       [8]  = "Capabilities Check",
> +       [9]  = "Device PLD Check",
> +       [10] = "Reserved",
> +       [11] = "System Locality Update",
> +       [12] = "Reserved (was previously Shutdown Request)",  /* Reserved in ACPI 6.0 */
> +       [13] = "System Resource Affinity Update",
> +       [14] = "Heterogeneous Memory Attributes Update",      /* ACPI 6.2 */
> +       [15] = "Error Disconnect Recover"                     /* ACPI 6.3 */
>  };
>
>  static const char *acpi_gbl_device_notify[5] = {
> @@ -521,26 +518,26 @@ const char *acpi_ut_get_notify_name(u32 notify_value, acpi_object_type type)
>   ******************************************************************************/
>
>  static const char *acpi_gbl_argument_type[20] = {
> -       /* 00 */ "Unknown ARGP",
> -       /* 01 */ "ByteData",
> -       /* 02 */ "ByteList",
> -       /* 03 */ "CharList",
> -       /* 04 */ "DataObject",
> -       /* 05 */ "DataObjectList",
> -       /* 06 */ "DWordData",
> -       /* 07 */ "FieldList",
> -       /* 08 */ "Name",
> -       /* 09 */ "NameString",
> -       /* 0A */ "ObjectList",
> -       /* 0B */ "PackageLength",
> -       /* 0C */ "SuperName",
> -       /* 0D */ "Target",
> -       /* 0E */ "TermArg",
> -       /* 0F */ "TermList",
> -       /* 10 */ "WordData",
> -       /* 11 */ "QWordData",
> -       /* 12 */ "SimpleName",
> -       /* 13 */ "NameOrRef"
> +       [0x00] = "Unknown ARGP",
> +       [0x01] = "ByteData",
> +       [0x02] = "ByteList",
> +       [0x03] = "CharList",
> +       [0x04] = "DataObject",
> +       [0x05] = "DataObjectList",
> +       [0x06] = "DWordData",
> +       [0x07] = "FieldList",
> +       [0x08] = "Name",
> +       [0x09] = "NameString",
> +       [0x0A] = "ObjectList",
> +       [0x0B] = "PackageLength",
> +       [0x0C] = "SuperName",
> +       [0x0D] = "Target",
> +       [0x0E] = "TermArg",
> +       [0x0F] = "TermList",
> +       [0x10] = "WordData",
> +       [0x11] = "QWordData",
> +       [0x12] = "SimpleName",
> +       [0x13] = "NameOrRef"
>  };
>
>  const char *acpi_ut_get_argument_type_name(u32 arg_type)
> --
> 2.35.1
>