* [PATCH 1/3] benet: Add missing comma between constant string array
2011-07-09 6:20 [PATCH 0/3] Add missing commas Joe Perches
@ 2011-07-09 6:20 ` Joe Perches
2011-07-09 9:57 ` David Miller
2011-07-09 6:20 ` [PATCH 2/3] iwlegacy: " Joe Perches
2011-07-09 6:20 ` [PATCH 3/3] iwlagn: " Joe Perches
2 siblings, 1 reply; 9+ messages in thread
From: Joe Perches @ 2011-07-09 6:20 UTC (permalink / raw)
To: Sathya Perla, Subbu Seetharaman, Ajit Khaparde; +Cc: netdev, linux-kernel
Multiple quoted strings are concatenated without comma separators.
Make the arrays const while there.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/benet/be_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 696f634..4ebd700 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -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",
--
1.7.6.131.g99019
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] iwlegacy: Add missing comma between constant string array
2011-07-09 6:20 [PATCH 0/3] Add missing commas Joe Perches
2011-07-09 6:20 ` [PATCH 1/3] benet: Add missing comma between constant string array Joe Perches
@ 2011-07-09 6:20 ` Joe Perches
2011-07-11 18:35 ` John W. Linville
2011-07-09 6:20 ` [PATCH 3/3] iwlagn: " Joe Perches
2 siblings, 1 reply; 9+ messages in thread
From: Joe Perches @ 2011-07-09 6:20 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Multiple quoted strings are concatenated without comma separators.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 46242d2..1433466 100644
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -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",
--
1.7.6.131.g99019
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] iwlegacy: Add missing comma between constant string array
2011-07-09 6:20 ` [PATCH 2/3] iwlegacy: " Joe Perches
@ 2011-07-11 18:35 ` John W. Linville
2011-07-13 9:25 ` Stanislaw Gruszka
0 siblings, 1 reply; 9+ messages in thread
From: John W. Linville @ 2011-07-11 18:35 UTC (permalink / raw)
To: Joe Perches; +Cc: Stanislaw Gruszka, linux-wireless, netdev, linux-kernel
How is this array indexed? Aren't you changing the index of the
later strings?
On Fri, Jul 08, 2011 at 11:20:24PM -0700, Joe Perches wrote:
> Multiple quoted strings are concatenated without comma separators.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
> index 46242d2..1433466 100644
> --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
> +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
> @@ -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",
> --
> 1.7.6.131.g99019
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] iwlegacy: Add missing comma between constant string array
2011-07-11 18:35 ` John W. Linville
@ 2011-07-13 9:25 ` Stanislaw Gruszka
0 siblings, 0 replies; 9+ messages in thread
From: Stanislaw Gruszka @ 2011-07-13 9:25 UTC (permalink / raw)
To: John W. Linville; +Cc: Joe Perches, linux-wireless, netdev, linux-kernel
On Mon, Jul 11, 2011 at 02:35:42PM -0400, John W. Linville wrote:
> 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
> On Fri, Jul 08, 2011 at 11:20:24PM -0700, Joe Perches wrote:
> > Multiple quoted strings are concatenated without comma separators.
> >
> > Signed-off-by: Joe Perches <joe@perches.com>
> > ---
> > drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
> > index 46242d2..1433466 100644
> > --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
> > +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
> > @@ -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",
> > --
> > 1.7.6.131.g99019
> >
> >
>
> --
> John W. Linville Someday the world will need a hero, and you
> linville@tuxdriver.com 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] iwlagn: Add missing comma between constant string array
2011-07-09 6:20 [PATCH 0/3] Add missing commas Joe Perches
2011-07-09 6:20 ` [PATCH 1/3] benet: Add missing comma between constant string array Joe Perches
2011-07-09 6:20 ` [PATCH 2/3] iwlegacy: " Joe Perches
@ 2011-07-09 6:20 ` Joe Perches
2011-07-11 13:42 ` Guy, Wey-Yi
2011-07-11 18:35 ` John W. Linville
2 siblings, 2 replies; 9+ messages in thread
From: Joe Perches @ 2011-07-09 6:20 UTC (permalink / raw)
To: Wey-Yi Guy, Intel Linux Wireless
Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Multiple quoted strings are concatenated without comma separators.
Make the array const while there.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 7e6c463..de1a0c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -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",
--
1.7.6.131.g99019
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] iwlagn: Add missing comma between constant string array
2011-07-09 6:20 ` [PATCH 3/3] iwlagn: " Joe Perches
@ 2011-07-11 13:42 ` Guy, Wey-Yi
2011-07-11 18:35 ` John W. Linville
1 sibling, 0 replies; 9+ messages in thread
From: Guy, Wey-Yi @ 2011-07-11 13:42 UTC (permalink / raw)
To: Joe Perches
Cc: Intel Linux Wireless, John W. Linville, linux-wireless, netdev,
linux-kernel
On Fri, 2011-07-08 at 23:20 -0700, Joe Perches wrote:
> Multiple quoted strings are concatenated without comma separators.
>
> Make the array const while there.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
> index 7e6c463..de1a0c1 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -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",
Thanks
Wey
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] iwlagn: Add missing comma between constant string array
2011-07-09 6:20 ` [PATCH 3/3] iwlagn: " Joe Perches
2011-07-11 13:42 ` Guy, Wey-Yi
@ 2011-07-11 18:35 ` John W. Linville
1 sibling, 0 replies; 9+ messages in thread
From: John W. Linville @ 2011-07-11 18:35 UTC (permalink / raw)
To: Joe Perches
Cc: Wey-Yi Guy, Intel Linux Wireless, linux-wireless, netdev, linux-kernel
How is this array indexed? Aren't you changing the index of the
later strings?
On Fri, Jul 08, 2011 at 11:20:25PM -0700, Joe Perches wrote:
> Multiple quoted strings are concatenated without comma separators.
>
> Make the array const while there.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
> index 7e6c463..de1a0c1 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -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",
> --
> 1.7.6.131.g99019
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 9+ messages in thread