diff options
| author | Joe Perches | 2010-09-14 06:23:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-09-16 22:02:37 +0200 |
| commit | 03a6cddbb81a9de87b40b1d528397a160269264e (patch) | |
| tree | dc2e9a3a396d55bd6beb3cbd947c3fff7a48b6a0 | |
| parent | Staging: vt665x: remove unused DEF definition (diff) | |
| download | kernel-qcow2-linux-03a6cddbb81a9de87b40b1d528397a160269264e.tar.gz kernel-qcow2-linux-03a6cddbb81a9de87b40b1d528397a160269264e.tar.xz kernel-qcow2-linux-03a6cddbb81a9de87b40b1d528397a160269264e.zip | |
staging: Use static const char * const where possible
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 14 | ||||
| -rw-r--r-- | drivers/staging/bcm/Debug.c | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 03ece0f8c6d4..c2947bc051dd 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -5075,13 +5075,13 @@ ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source) void ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal) { - char *errString[] = { - [WMI_TARGET_PM_ERR_FAIL] "WMI_TARGET_PM_ERR_FAIL", - [WMI_TARGET_KEY_NOT_FOUND] "WMI_TARGET_KEY_NOT_FOUND", - [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR", - [WMI_TARGET_BMISS] "WMI_TARGET_BMISS", - [WMI_PSDISABLE_NODE_JOIN] "WMI_PSDISABLE_NODE_JOIN" - }; + static const char * const errString[] = { + [WMI_TARGET_PM_ERR_FAIL] "WMI_TARGET_PM_ERR_FAIL", + [WMI_TARGET_KEY_NOT_FOUND] "WMI_TARGET_KEY_NOT_FOUND", + [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR", + [WMI_TARGET_BMISS] "WMI_TARGET_BMISS", + [WMI_PSDISABLE_NODE_JOIN] "WMI_PSDISABLE_NODE_JOIN" + }; A_PRINTF("AR6000 Error on Target. Error = 0x%x\n", errorVal); diff --git a/drivers/staging/bcm/Debug.c b/drivers/staging/bcm/Debug.c index 213f4bcc5dfc..d01eb120500a 100644 --- a/drivers/staging/bcm/Debug.c +++ b/drivers/staging/bcm/Debug.c @@ -1,12 +1,13 @@ #include "headers.h" -char *buff_dump_base[]={"DEC", "HEX", "OCT", "BIN" }; - static UINT current_debug_level=BCM_SCREAM; int bcm_print_buffer( UINT debug_level, const char *function_name, char *file_name, int line_number, unsigned char *buffer, int bufferlen, unsigned int base) { + static const char * const buff_dump_base[] = { + "DEC", "HEX", "OCT", "BIN" + }; if(debug_level>=current_debug_level) { int i=0; |