From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Jing Huang <huangj@brocade.com>,
"James E.J. Bottomley" <James.Bottomley@suse.de>,
YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>,
Andrew Vasquez <andrew.vasquez@qlogic.com>,
linux-driver@qlogic.com, Ravi Anand <ravi.anand@qlogic.com>,
Vikas Chaudhary <vikas.chaudhary@qlogic.com>,
iscsi-driver@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH next 10/16] drivers/scsi: Use static const char * const where possible
Date: Mon, 13 Sep 2010 21:23:56 -0700 [thread overview]
Message-ID: <3507174cc441fe502402e4e85e372eacb01a1f0c.1284435710.git.joe@perches.com> (raw)
In-Reply-To: <cover.1284435709.git.joe@perches.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/scsi/bfa/rport.c | 4 +++-
drivers/scsi/pcmcia/nsp_debug.c | 2 +-
drivers/scsi/qla2xxx/qla_nx.c | 4 ++--
drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/bfa/rport.c b/drivers/scsi/bfa/rport.c
index 9b4c2c9..803f29e 100644
--- a/drivers/scsi/bfa/rport.c
+++ b/drivers/scsi/bfa/rport.c
@@ -2068,7 +2068,9 @@ bfa_fcs_rport_aen_post(struct bfa_fcs_rport_s *rport,
wwn_t rpwwn = rport->pwwn;
char lpwwn_ptr[BFA_STRING_32];
char rpwwn_ptr[BFA_STRING_32];
- char *prio_str[] = { "unknown", "high", "medium", "low" };
+ static const char * const prio_str[] = {
+ "unknown", "high", "medium", "low"
+ };
wwn2str(lpwwn_ptr, lpwwn);
wwn2str(rpwwn_ptr, rpwwn);
diff --git a/drivers/scsi/pcmcia/nsp_debug.c b/drivers/scsi/pcmcia/nsp_debug.c
index 3c6ef64..dbd567c 100644
--- a/drivers/scsi/pcmcia/nsp_debug.c
+++ b/drivers/scsi/pcmcia/nsp_debug.c
@@ -147,7 +147,7 @@ static void show_phase(struct scsi_cmnd *SCpnt)
{
int i = SCpnt->SCp.phase;
- char *ph[] = {
+ static const char * const ph[] = {
"PH_UNDETERMINED",
"PH_ARBSTART",
"PH_SELSTART",
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index c5ac876..7525e95 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -327,8 +327,8 @@ unsigned qla82xx_crb_hub_agt[64] = {
};
/* Device states */
-char *qdev_state[] = {
- "Unknown",
+static const char * const qdev_state[] = {
+ "Unknown",
"Cold",
"Initializing",
"Ready",
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 5d4a382..77ee640 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -332,7 +332,7 @@ static unsigned qla4_8xxx_crb_hub_agt[64] = {
};
/* Device states */
-static char *qdev_state[] = {
+static const char * const qdev_state[] = {
"Unknown",
"Cold",
"Initializing",
--
1.7.3.rc1
next prev parent reply other threads:[~2010-09-14 4:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-14 4:23 [PATCH next 00/16] treewide: " 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
2010-09-14 4:23 ` [PATCH next 02/16] arch/ia64: " 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 ` [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 ` Joe Perches [this message]
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
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=3507174cc441fe502402e4e85e372eacb01a1f0c.1284435710.git.joe@perches.com \
--to=joe@perches.com \
--cc=James.Bottomley@suse.de \
--cc=andrew.vasquez@qlogic.com \
--cc=huangj@brocade.com \
--cc=iscsi-driver@qlogic.com \
--cc=linux-driver@qlogic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ravi.anand@qlogic.com \
--cc=vikas.chaudhary@qlogic.com \
--cc=yokota@netlab.is.tsukuba.ac.jp \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®