Commit 31019075 authored by Joe Perches's avatar Joe Perches Committed by Matt Turner
Browse files

alpha: Use static const char * const where possible 



Acked-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 151b6a5f

arch/alpha/kernel/err_ev6.c

+7 −5
Original line number Diff line number Diff line
@@ -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",

	static const char * const sourcename[] = {

		"UNKNOWN", "UNKNOWN", "UNKNOWN",

		"MEMORY", "BCACHE", "DCACHE",

			       "BCACHE PROBE", "BCACHE PROBE" };

	char *streamname[] = { "D", "I" };

	char *bitsname[] = { "SINGLE", "DOUBLE" };

		"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;

arch/alpha/kernel/err_marvel.c

+17 −16
Original line number Diff line number Diff line
@@ -589,7 +589,8 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt) 
static void

marvel_print_pox_trans_sum(u64 trans_sum)

{

	char *pcix_cmd[] = { "Interrupt Acknowledge",

	static const char * const pcix_cmd[] = {

		"Interrupt Acknowledge",

		"Special Cycle",

		"I/O Read",

		"I/O Write",

arch/alpha/kernel/err_titan.c

+20 −15
Original line number Diff line number Diff line
@@ -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,7 +144,8 @@ 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",

	static const char * const perror_cmd[] = {

		"Interrupt Acknowledge", "Special Cycle",

		"I/O Read",		"I/O Write",

		"Reserved",		"Reserved",

		"Memory Read",		"Memory Write",
@@ -273,9 +278,9 @@ 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)",

	static const char * const agperror_cmd[] = {

		"Read (low-priority)",	"Read (high-priority)",

		"Write (low-priority)",	"Write (high-priority)",

		"Reserved",		"Reserved",

		"Flush",		"Fence"

	};

arch/alpha/kernel/osf_sys.c

+2 −2
Original line number Diff line number Diff line
@@ -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;