Add missing commas

PATCH Applied Joe Perches 5 participants 9 messages Jul 9, 2011 – Jul 13, 2011

Subsystems (3)

Networking Network drivers Networking drivers (wireless)

lore

Share & tools

lore

Joe Perches

author

2011-07-09 06:20 UTC #0 lore raw

cover Add missing commas

A patch to staging/gma500 found a missing comma in arrays declarations. Here are some others.

Joe Perches (3):
benet: Add missing comma between constant string array
iwlegacy: Add missing comma between constant string array
iwlagn: Add missing comma between constant string array

 drivers/net/benet/be_main.c                  |    6 +++---
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Signature · 1 line

1.7.6.131.g99019

Joe Perches

author

2011-07-09 06:20 UTC #1 lore raw

PATCH 1/3 benet: Add missing comma between constant string array

Multiple quoted strings are concatenated without comma separators.

Make the arrays const while there.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/benet/be_main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/net/benet/be_main.c +3 -3

index 696f634..4ebd700 100644
@@ -44,7 +44,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
 };
 MODULE_DEVICE_TABLE(pci, be_dev_ids);
 /* UE Status Low CSR */
-static char *ue_status_low_desc[] = {
+static const char * const ue_status_low_desc[] = {
 	"CEV",
 	"CTX",
 	"DBUF",

@@ -79,7 +79,7 @@ static char *ue_status_low_desc[] = {
 	"MPU_INTPEND"
 };
 /* UE Status High CSR */
-static char *ue_status_hi_desc[] = {
+static const char * const ue_status_hi_desc[] = {
 	"LPCMEMHOST",
 	"MGMT_MAC",
 	"PCS0ONLINE",

@@ -103,7 +103,7 @@ static char *ue_status_hi_desc[] = {
 	"HOST7",
 	"HOST8",
 	"HOST9",
-	"NETC"
+	"NETC",
 	"Unknown",
 	"Unknown",
 	"Unknown",

Signature · 1 line

1.7.6.131.g99019

David Miller

maintainer Applied

2011-07-09 09:57 UTC #2 lore raw

Re: [PATCH 1/3] benet: Add missing comma between constant string array

From: Joe Perches <[email protected]>
Date: Fri, 8 Jul 2011 23:20:23 -0700

Quoted 5 lines

Multiple quoted strings are concatenated without comma separators.
Make the arrays const while there.
Signed-off-by Joe Perches <[email protected]>

Applied, thanks Joe.

Joe Perches

author

2011-07-09 06:20 UTC #3 lore raw

PATCH 2/3 iwlegacy: Add missing comma between constant string array

In reply to Joe Perches

Multiple quoted strings are concatenated without comma separators.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/iwlegacy/iwl4965-base.c +1 -1

index 46242d2..1433466 100644
@@ -1484,7 +1484,7 @@ static const char * const desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Signature · 1 line

1.7.6.131.g99019

John W. Linville

2011-07-11 18:35 UTC #4 lore raw

Re: [PATCH 2/3] iwlegacy: Add missing comma between constant string array

How is this array indexed? Aren't you changing the index of the later strings?

Quoted 24 lines · Joe Perches

Multiple quoted strings are concatenated without comma separators.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/iwlegacy/iwl4965-base.c +1 -1

index 46242d2..1433466 100644
@@ -1484,7 +1484,7 @@ static const char * const desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Signature · 1 line

1.7.6.131.g99019

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.

Stanislaw Gruszka

2011-07-13 09:25 UTC #5 lore raw

Re: [PATCH 2/3] iwlegacy: Add missing comma between constant string array

Quoted 2 lines · John W. Linville

How is this array indexed? Aren't you changing the index of the later strings?

We read index directly from device memory (and check agains ARRAY_SIZE). Patch make indexing correct with code author intention, ACK. iwlagn should be simmilarly fine.

Stanislaw

Quoted 33 lines · Joe Perches

Quoted 24 lines

Multiple quoted strings are concatenated without comma separators.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/iwlegacy/iwl4965-base.c +1 -1

index 46242d2..1433466 100644
@@ -1484,7 +1484,7 @@ static const char * const desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Signature · 1 line

1.7.6.131.g99019

Signature · 6 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Joe Perches

author

2011-07-09 06:20 UTC #6 lore raw

PATCH 3/3 iwlagn: Add missing comma between constant string array

In reply to Joe Perches

Multiple quoted strings are concatenated without comma separators.

Make the array const while there.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/iwlwifi/iwl-agn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/net/wireless/iwlwifi/iwl-agn.c +2 -2

index 7e6c463..de1a0c1 100644
@@ -1563,7 +1563,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 	release_firmware(ucode_raw);
 }
 
-static const char *desc_lookup_text[] = {
+static const char * const desc_lookup_text[] = {
 	"OK",
 	"FAIL",
 	"BAD_PARAM",

@@ -1587,7 +1587,7 @@ static const char *desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Signature · 1 line

1.7.6.131.g99019

Guy, Wey-Yi

Acked-by on v1 3/3

2011-07-11 13:42 UTC #7 lore raw

Re: [PATCH 3/3] iwlagn: Add missing comma between constant string array

Quoted 5 lines · Joe Perches

Multiple quoted strings are concatenated without comma separators.
Make the array const while there.
Signed-off-by Joe Perches <[email protected]>

Acked-by Wey-Yi Guy <[email protected]>

Quoted 18 lines

---
 drivers/net/wireless/iwlwifi/iwl-agn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1

index 7e6c463..de1a0c1 100644
@@ -1563,7 +1563,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 	release_firmware(ucode_raw);
 }
 
-static const char *desc_lookup_text[] = {
+static const char * const desc_lookup_text[] = {
 	"OK",
 	"FAIL",
 	"BAD_PARAM",

drivers/net/wireless/iwlwifi/iwl-agn.c static const char *desc_lookup_text[] = { · line 1593

Quoted 8 lines

drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1

@@ -1587,7 +1587,7 @@ static const char *desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Thanks
Wey

John W. Linville

2011-07-11 18:35 UTC #8 lore raw

Re: [PATCH 3/3] iwlagn: Add missing comma between constant string array

In reply to Joe Perches

How is this array indexed? Aren't you changing the index of the later strings?

Quoted 35 lines · Joe Perches

Multiple quoted strings are concatenated without comma separators.

Make the array const while there.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/net/wireless/iwlwifi/iwl-agn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/net/wireless/iwlwifi/iwl-agn.c +2 -2

index 7e6c463..de1a0c1 100644
@@ -1563,7 +1563,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 	release_firmware(ucode_raw);
 }
 
-static const char *desc_lookup_text[] = {
+static const char * const desc_lookup_text[] = {
 	"OK",
 	"FAIL",
 	"BAD_PARAM",

@@ -1587,7 +1587,7 @@ static const char *desc_lookup_text[] = {
 	"NMI_INTERRUPT_DATA_ACTION_PT",
 	"NMI_TRM_HW_ER",
 	"NMI_INTERRUPT_TRM",
-	"NMI_INTERRUPT_BREAK_POINT"
+	"NMI_INTERRUPT_BREAK_POINT",
 	"DEBUG_0",
 	"DEBUG_1",
 	"DEBUG_2",

Signature · 1 line

1.7.6.131.g99019

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.