All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gmail.com>
To: Joe Perches <joe@perches.com>
Cc: linux-kernel@vger.kernel.org, Richard Henderson <rth@twiddle.net>,
	Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
	linux-alpha@vger.kernel.org
Subject: Re: [PATCH next 01/16] arch/alpha: Use static const char * const where possible
Date: Tue, 14 Sep 2010 13:03:51 -0400	[thread overview]
Message-ID: <AANLkTinwZe9-LwrZeMqjRw+FcLnjwmodbC6iTTOktd_z@mail.gmail.com> (raw)
In-Reply-To: <3b211935182d8ac989fbdfde01fbdc25077151a9.1284435709.git.joe@perches.com>

On Tue, Sep 14, 2010 at 12:23 AM, Joe Perches <joe@perches.com> wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/alpha/kernel/err_ev6.c    |   12 +++++++-----
>  arch/alpha/kernel/err_marvel.c |   33 +++++++++++++++++----------------
>  arch/alpha/kernel/err_titan.c  |   35 ++++++++++++++++++++---------------
>  arch/alpha/kernel/osf_sys.c    |    4 ++--
>  4 files changed, 46 insertions(+), 38 deletions(-)
>
> diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c
> index 8ca6345..253cf1a 100644
> --- a/arch/alpha/kernel/err_ev6.c
> +++ b/arch/alpha/kernel/err_ev6.c
> @@ -90,11 +90,13 @@ static int
>  ev6_parse_cbox(u64 c_addr, u64 c1_syn, u64 c2_syn,
>               u64 c_stat, u64 c_sts, int print)
>  {
> -       char *sourcename[] = { "UNKNOWN", "UNKNOWN", "UNKNOWN",
> -                              "MEMORY", "BCACHE", "DCACHE",
> -                              "BCACHE PROBE", "BCACHE PROBE" };
> -       char *streamname[] = { "D", "I" };
> -       char *bitsname[] = { "SINGLE", "DOUBLE" };
> +       static const char * const sourcename[] = {
> +               "UNKNOWN", "UNKNOWN", "UNKNOWN",
> +               "MEMORY", "BCACHE", "DCACHE",
> +               "BCACHE PROBE", "BCACHE PROBE"
> +       };
> +       static const char * const streamname[] = { "D", "I" };
> +       static const char * const bitsname[] = { "SINGLE", "DOUBLE" };
>        int status = MCHK_DISPOSITION_REPORT;
>        int source = -1, stream = -1, bits = -1;
>
> diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
> index 5c905aa..648ae88 100644
> --- a/arch/alpha/kernel/err_marvel.c
> +++ b/arch/alpha/kernel/err_marvel.c
> @@ -589,22 +589,23 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt)
>  static void
>  marvel_print_pox_trans_sum(u64 trans_sum)
>  {
> -       char *pcix_cmd[] = { "Interrupt Acknowledge",
> -                            "Special Cycle",
> -                            "I/O Read",
> -                            "I/O Write",
> -                            "Reserved",
> -                            "Reserved / Device ID Message",
> -                            "Memory Read",
> -                            "Memory Write",
> -                            "Reserved / Alias to Memory Read Block",
> -                            "Reserved / Alias to Memory Write Block",
> -                            "Configuration Read",
> -                            "Configuration Write",
> -                            "Memory Read Multiple / Split Completion",
> -                            "Dual Address Cycle",
> -                            "Memory Read Line / Memory Read Block",
> -                            "Memory Write and Invalidate / Memory Write Block"
> +       static const char * const pcix_cmd[] = {
> +               "Interrupt Acknowledge",
> +               "Special Cycle",
> +               "I/O Read",
> +               "I/O Write",
> +               "Reserved",
> +               "Reserved / Device ID Message",
> +               "Memory Read",
> +               "Memory Write",
> +               "Reserved / Alias to Memory Read Block",
> +               "Reserved / Alias to Memory Write Block",
> +               "Configuration Read",
> +               "Configuration Write",
> +               "Memory Read Multiple / Split Completion",
> +               "Dual Address Cycle",
> +               "Memory Read Line / Memory Read Block",
> +               "Memory Write and Invalidate / Memory Write Block"
>        };
>
>  #define IO7__POX_TRANSUM__PCI_ADDR__S          (0)
> diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
> index f7ed97c..c3b3781 100644
> --- a/arch/alpha/kernel/err_titan.c
> +++ b/arch/alpha/kernel/err_titan.c
> @@ -75,8 +75,12 @@ titan_parse_p_serror(int which, u64 serror, int print)
>        int status = MCHK_DISPOSITION_REPORT;
>
>  #ifdef CONFIG_VERBOSE_MCHECK
> -       char *serror_src[] = {"GPCI", "APCI", "AGP HP", "AGP LP"};
> -       char *serror_cmd[] = {"DMA Read", "DMA RMW", "SGTE Read", "Reserved"};
> +       static const char * const serror_src[] = {
> +               "GPCI", "APCI", "AGP HP", "AGP LP"
> +       };
> +       static const char * const serror_cmd[] = {
> +               "DMA Read", "DMA RMW", "SGTE Read", "Reserved"
> +       };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
>  #define TITAN__PCHIP_SERROR__LOST_UECC (1UL << 0)
> @@ -140,14 +144,15 @@ titan_parse_p_perror(int which, int port, u64 perror, int print)
>        int status = MCHK_DISPOSITION_REPORT;
>
>  #ifdef CONFIG_VERBOSE_MCHECK
> -       char *perror_cmd[] = { "Interrupt Acknowledge", "Special Cycle",
> -                              "I/O Read",              "I/O Write",
> -                              "Reserved",              "Reserved",
> -                              "Memory Read",           "Memory Write",
> -                              "Reserved",              "Reserved",
> -                              "Configuration Read",    "Configuration Write",
> -                              "Memory Read Multiple",  "Dual Address Cycle",
> -                              "Memory Read Line","Memory Write and Invalidate"
> +       static const char * const perror_cmd[] = {
> +               "Interrupt Acknowledge", "Special Cycle",
> +               "I/O Read",             "I/O Write",
> +               "Reserved",             "Reserved",
> +               "Memory Read",          "Memory Write",
> +               "Reserved",             "Reserved",
> +               "Configuration Read",   "Configuration Write",
> +               "Memory Read Multiple", "Dual Address Cycle",
> +               "Memory Read Line",     "Memory Write and Invalidate"
>        };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
> @@ -273,11 +278,11 @@ titan_parse_p_agperror(int which, u64 agperror, int print)
>        int cmd, len;
>        unsigned long addr;
>
> -       char *agperror_cmd[] = { "Read (low-priority)", "Read (high-priority)",
> -                                "Write (low-priority)",
> -                                "Write (high-priority)",
> -                                "Reserved",            "Reserved",
> -                                "Flush",               "Fence"
> +       static const char * const agperror_cmd[] = {
> +               "Read (low-priority)",  "Read (high-priority)",
> +               "Write (low-priority)", "Write (high-priority)",
> +               "Reserved",             "Reserved",
> +               "Flush",                "Fence"
>        };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
> diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
> index 5d1e6d6..16bc1f5 100644
> --- a/arch/alpha/kernel/osf_sys.c
> +++ b/arch/alpha/kernel/osf_sys.c
> @@ -594,7 +594,7 @@ SYSCALL_DEFINE2(osf_sigstack, struct sigstack __user *, uss,
>
>  SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
>  {
> -       char *sysinfo_table[] = {
> +       const char *sysinfo_table[] = {
>                utsname()->sysname,
>                utsname()->nodename,
>                utsname()->release,
> @@ -606,7 +606,7 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
>                "dummy",        /* secure RPC domain */
>        };
>        unsigned long offset;
> -       char *res;
> +       const char *res;
>        long len, err = -EINVAL;
>
>        offset = command-1;
> --
> 1.7.3.rc1

Thanks Joe. I'll vacuum this up.

Matt

WARNING: multiple messages have this Message-ID (diff)
From: Matt Turner <mattst88@gmail.com>
To: Joe Perches <joe@perches.com>
Cc: linux-kernel@vger.kernel.org, Richard Henderson <rth@twiddle.net>,
	Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
	linux-alpha@vger.kernel.org
Subject: Re: [PATCH next 01/16] arch/alpha: Use static const char * const where possible
Date: Tue, 14 Sep 2010 13:03:51 -0400	[thread overview]
Message-ID: <AANLkTinwZe9-LwrZeMqjRw+FcLnjwmodbC6iTTOktd_z@mail.gmail.com> (raw)
In-Reply-To: <3b211935182d8ac989fbdfde01fbdc25077151a9.1284435709.git.joe@perches.com>

On Tue, Sep 14, 2010 at 12:23 AM, Joe Perches <joe@perches.com> wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/alpha/kernel/err_ev6.c    |   12 +++++++-----
>  arch/alpha/kernel/err_marvel.c |   33 +++++++++++++++++----------------
>  arch/alpha/kernel/err_titan.c  |   35 ++++++++++++++++++++---------------
>  arch/alpha/kernel/osf_sys.c    |    4 ++--
>  4 files changed, 46 insertions(+), 38 deletions(-)
>
> diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c
> index 8ca6345..253cf1a 100644
> --- a/arch/alpha/kernel/err_ev6.c
> +++ b/arch/alpha/kernel/err_ev6.c
> @@ -90,11 +90,13 @@ static int
>  ev6_parse_cbox(u64 c_addr, u64 c1_syn, u64 c2_syn,
>               u64 c_stat, u64 c_sts, int print)
>  {
> -       char *sourcename[] = { "UNKNOWN", "UNKNOWN", "UNKNOWN",
> -                              "MEMORY", "BCACHE", "DCACHE",
> -                              "BCACHE PROBE", "BCACHE PROBE" };
> -       char *streamname[] = { "D", "I" };
> -       char *bitsname[] = { "SINGLE", "DOUBLE" };
> +       static const char * const sourcename[] = {
> +               "UNKNOWN", "UNKNOWN", "UNKNOWN",
> +               "MEMORY", "BCACHE", "DCACHE",
> +               "BCACHE PROBE", "BCACHE PROBE"
> +       };
> +       static const char * const streamname[] = { "D", "I" };
> +       static const char * const bitsname[] = { "SINGLE", "DOUBLE" };
>        int status = MCHK_DISPOSITION_REPORT;
>        int source = -1, stream = -1, bits = -1;
>
> diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
> index 5c905aa..648ae88 100644
> --- a/arch/alpha/kernel/err_marvel.c
> +++ b/arch/alpha/kernel/err_marvel.c
> @@ -589,22 +589,23 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt)
>  static void
>  marvel_print_pox_trans_sum(u64 trans_sum)
>  {
> -       char *pcix_cmd[] = { "Interrupt Acknowledge",
> -                            "Special Cycle",
> -                            "I/O Read",
> -                            "I/O Write",
> -                            "Reserved",
> -                            "Reserved / Device ID Message",
> -                            "Memory Read",
> -                            "Memory Write",
> -                            "Reserved / Alias to Memory Read Block",
> -                            "Reserved / Alias to Memory Write Block",
> -                            "Configuration Read",
> -                            "Configuration Write",
> -                            "Memory Read Multiple / Split Completion",
> -                            "Dual Address Cycle",
> -                            "Memory Read Line / Memory Read Block",
> -                            "Memory Write and Invalidate / Memory Write Block"
> +       static const char * const pcix_cmd[] = {
> +               "Interrupt Acknowledge",
> +               "Special Cycle",
> +               "I/O Read",
> +               "I/O Write",
> +               "Reserved",
> +               "Reserved / Device ID Message",
> +               "Memory Read",
> +               "Memory Write",
> +               "Reserved / Alias to Memory Read Block",
> +               "Reserved / Alias to Memory Write Block",
> +               "Configuration Read",
> +               "Configuration Write",
> +               "Memory Read Multiple / Split Completion",
> +               "Dual Address Cycle",
> +               "Memory Read Line / Memory Read Block",
> +               "Memory Write and Invalidate / Memory Write Block"
>        };
>
>  #define IO7__POX_TRANSUM__PCI_ADDR__S          (0)
> diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
> index f7ed97c..c3b3781 100644
> --- a/arch/alpha/kernel/err_titan.c
> +++ b/arch/alpha/kernel/err_titan.c
> @@ -75,8 +75,12 @@ titan_parse_p_serror(int which, u64 serror, int print)
>        int status = MCHK_DISPOSITION_REPORT;
>
>  #ifdef CONFIG_VERBOSE_MCHECK
> -       char *serror_src[] = {"GPCI", "APCI", "AGP HP", "AGP LP"};
> -       char *serror_cmd[] = {"DMA Read", "DMA RMW", "SGTE Read", "Reserved"};
> +       static const char * const serror_src[] = {
> +               "GPCI", "APCI", "AGP HP", "AGP LP"
> +       };
> +       static const char * const serror_cmd[] = {
> +               "DMA Read", "DMA RMW", "SGTE Read", "Reserved"
> +       };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
>  #define TITAN__PCHIP_SERROR__LOST_UECC (1UL << 0)
> @@ -140,14 +144,15 @@ titan_parse_p_perror(int which, int port, u64 perror, int print)
>        int status = MCHK_DISPOSITION_REPORT;
>
>  #ifdef CONFIG_VERBOSE_MCHECK
> -       char *perror_cmd[] = { "Interrupt Acknowledge", "Special Cycle",
> -                              "I/O Read",              "I/O Write",
> -                              "Reserved",              "Reserved",
> -                              "Memory Read",           "Memory Write",
> -                              "Reserved",              "Reserved",
> -                              "Configuration Read",    "Configuration Write",
> -                              "Memory Read Multiple",  "Dual Address Cycle",
> -                              "Memory Read Line","Memory Write and Invalidate"
> +       static const char * const perror_cmd[] = {
> +               "Interrupt Acknowledge", "Special Cycle",
> +               "I/O Read",             "I/O Write",
> +               "Reserved",             "Reserved",
> +               "Memory Read",          "Memory Write",
> +               "Reserved",             "Reserved",
> +               "Configuration Read",   "Configuration Write",
> +               "Memory Read Multiple", "Dual Address Cycle",
> +               "Memory Read Line",     "Memory Write and Invalidate"
>        };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
> @@ -273,11 +278,11 @@ titan_parse_p_agperror(int which, u64 agperror, int print)
>        int cmd, len;
>        unsigned long addr;
>
> -       char *agperror_cmd[] = { "Read (low-priority)", "Read (high-priority)",
> -                                "Write (low-priority)",
> -                                "Write (high-priority)",
> -                                "Reserved",            "Reserved",
> -                                "Flush",               "Fence"
> +       static const char * const agperror_cmd[] = {
> +               "Read (low-priority)",  "Read (high-priority)",
> +               "Write (low-priority)", "Write (high-priority)",
> +               "Reserved",             "Reserved",
> +               "Flush",                "Fence"
>        };
>  #endif /* CONFIG_VERBOSE_MCHECK */
>
> diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
> index 5d1e6d6..16bc1f5 100644
> --- a/arch/alpha/kernel/osf_sys.c
> +++ b/arch/alpha/kernel/osf_sys.c
> @@ -594,7 +594,7 @@ SYSCALL_DEFINE2(osf_sigstack, struct sigstack __user *, uss,
>
>  SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
>  {
> -       char *sysinfo_table[] = {
> +       const char *sysinfo_table[] = {
>                utsname()->sysname,
>                utsname()->nodename,
>                utsname()->release,
> @@ -606,7 +606,7 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
>                "dummy",        /* secure RPC domain */
>        };
>        unsigned long offset;
> -       char *res;
> +       const char *res;
>        long len, err = -EINVAL;
>
>        offset = command-1;
> --
> 1.7.3.rc1

Thanks Joe. I'll vacuum this up.

Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2010-09-14 17:04 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-14  4:23 [PATCH next 00/16] treewide: Use static const char * const where possible Joe Perches
2010-09-14  4:23 ` Joe Perches
2010-09-14  4:23 ` Joe Perches
2010-09-14  4:23 ` [PATCH next 01/16] arch/alpha: " Joe Perches
2010-09-14 15:37   ` Richard Henderson
2010-09-14 17:03   ` Matt Turner [this message]
2010-09-14 17:03     ` Matt Turner
2010-09-14  4:23 ` [PATCH next 02/16] arch/ia64: " Joe Perches
2010-09-14  4:23   ` Joe Perches
2010-09-14  4:23 ` [PATCH next 03/16] arch/microblaze: " Joe Perches
2010-09-14  5:59   ` Michal Simek
2010-09-14  4:23 ` [PATCH next 04/16] arch/x86: " Joe Perches
2010-09-14  4:23 ` [PATCH next 05/16] drivers/gpu: " Joe Perches
2010-09-14  4:23   ` Joe Perches
2010-09-14  4:23 ` [PATCH next 06/16] drivers/isdn: " Joe Perches
2010-09-14  4:23 ` [PATCH next 07/16] drivers/net: " Joe Perches
2010-09-14  4:23 ` [PATCH next 08/16] drivers/net/pcmcia: " Joe Perches
2010-09-14  4:23 ` [PATCH next 09/16] drivers/net/wireless: " Joe Perches
2010-09-14  7:12   ` Ivo Van Doorn
2010-09-14  4:23 ` [PATCH next 10/16] drivers/scsi: " Joe Perches
2010-09-14  4:23 ` [PATCH next 11/16] drivers/staging: " Joe Perches
2010-09-14  4:23 ` [PATCH next 12/16] drivers/usb: " Joe Perches
2010-09-14  4:23 ` [PATCH next 13/16] drivers/watchdog: " Joe Perches
2010-09-14  4:24 ` [PATCH next 14/16] fs: " Joe Perches
2010-09-14  4:24 ` [PATCH next 15/16] net/irda: " Joe Perches
2010-09-14  4:24 ` [PATCH next 16/16] sound: " Joe Perches
2010-09-14 14:17   ` Takashi Iwai
2010-09-14 14:17     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTinwZe9-LwrZeMqjRw+FcLnjwmodbC6iTTOktd_z@mail.gmail.com \
    --to=mattst88@gmail.com \
    --cc=ink@jurassic.park.msu.ru \
    --cc=joe@perches.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.