diff options
author | Jean Delvare <jdelvare@suse.de> | 2013-09-11 17:24:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:58:51 -0400 |
commit | ffbbb96dd7570b9aafd426cd77a7ee03d224cabf (patch) | |
tree | d02a69d3abba00f257e1863e9ecb78da31dc82e8 /drivers/firmware/dmi_scan.c | |
parent | 02d9c47f1bf2304d6482e1e69e00c06791d86908 (diff) |
firmware/dmi_scan: constify strings
Add const to all DMI string pointers where this is possible. This fixes a
checkpatch warning.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Joe Perches <joe@perches.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/firmware/dmi_scan.c')
-rw-r--r-- | drivers/firmware/dmi_scan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 5a5ca664f3e7..9a094bb44e3d 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * of and an antecedent to, SMBIOS, which stands for System | 14 | * of and an antecedent to, SMBIOS, which stands for System |
15 | * Management BIOS. See further: http://www.dmtf.org/standards | 15 | * Management BIOS. See further: http://www.dmtf.org/standards |
16 | */ | 16 | */ |
17 | static char dmi_empty_string[] = " "; | 17 | static const char dmi_empty_string[] = " "; |
18 | 18 | ||
19 | static u16 __initdata dmi_ver; | 19 | static u16 __initdata dmi_ver; |
20 | /* | 20 | /* |
@@ -49,7 +49,7 @@ static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s) | |||
49 | return ""; | 49 | return ""; |
50 | } | 50 | } |
51 | 51 | ||
52 | static char * __init dmi_string(const struct dmi_header *dm, u8 s) | 52 | static const char * __init dmi_string(const struct dmi_header *dm, u8 s) |
53 | { | 53 | { |
54 | const char *bp = dmi_string_nosave(dm, s); | 54 | const char *bp = dmi_string_nosave(dm, s); |
55 | char *str; | 55 | char *str; |
@@ -133,7 +133,7 @@ static int __init dmi_checksum(const u8 *buf, u8 len) | |||
133 | return sum == 0; | 133 | return sum == 0; |
134 | } | 134 | } |
135 | 135 | ||
136 | static char *dmi_ident[DMI_STRING_MAX]; | 136 | static const char *dmi_ident[DMI_STRING_MAX]; |
137 | static LIST_HEAD(dmi_devices); | 137 | static LIST_HEAD(dmi_devices); |
138 | int dmi_available; | 138 | int dmi_available; |
139 | 139 | ||
@@ -144,7 +144,7 @@ static void __init dmi_save_ident(const struct dmi_header *dm, int slot, | |||
144 | int string) | 144 | int string) |
145 | { | 145 | { |
146 | const char *d = (const char *) dm; | 146 | const char *d = (const char *) dm; |
147 | char *p; | 147 | const char *p; |
148 | 148 | ||
149 | if (dmi_ident[slot]) | 149 | if (dmi_ident[slot]) |
150 | return; | 150 | return; |
@@ -252,7 +252,7 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) | |||
252 | struct dmi_device *dev; | 252 | struct dmi_device *dev; |
253 | 253 | ||
254 | for (i = 1; i <= count; i++) { | 254 | for (i = 1; i <= count; i++) { |
255 | char *devname = dmi_string(dm, i); | 255 | const char *devname = dmi_string(dm, i); |
256 | 256 | ||
257 | if (devname == dmi_empty_string) | 257 | if (devname == dmi_empty_string) |
258 | continue; | 258 | continue; |