Commit ffbbb96d authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds

firmware/dmi_scan: constify strings

Add const to all DMI string pointers where this is possible.  This fixes a
checkpatch warning.
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Cc: Joe Perches <joe@perches.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02d9c47f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* of and an antecedent to, SMBIOS, which stands for System * of and an antecedent to, SMBIOS, which stands for System
* Management BIOS. See further: http://www.dmtf.org/standards * Management BIOS. See further: http://www.dmtf.org/standards
*/ */
static char dmi_empty_string[] = " "; static const char dmi_empty_string[] = " ";
static u16 __initdata dmi_ver; static u16 __initdata dmi_ver;
/* /*
...@@ -49,7 +49,7 @@ static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s) ...@@ -49,7 +49,7 @@ static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
return ""; return "";
} }
static char * __init dmi_string(const struct dmi_header *dm, u8 s) static const char * __init dmi_string(const struct dmi_header *dm, u8 s)
{ {
const char *bp = dmi_string_nosave(dm, s); const char *bp = dmi_string_nosave(dm, s);
char *str; char *str;
...@@ -133,7 +133,7 @@ static int __init dmi_checksum(const u8 *buf, u8 len) ...@@ -133,7 +133,7 @@ static int __init dmi_checksum(const u8 *buf, u8 len)
return sum == 0; return sum == 0;
} }
static char *dmi_ident[DMI_STRING_MAX]; static const char *dmi_ident[DMI_STRING_MAX];
static LIST_HEAD(dmi_devices); static LIST_HEAD(dmi_devices);
int dmi_available; int dmi_available;
...@@ -144,7 +144,7 @@ static void __init dmi_save_ident(const struct dmi_header *dm, int slot, ...@@ -144,7 +144,7 @@ static void __init dmi_save_ident(const struct dmi_header *dm, int slot,
int string) int string)
{ {
const char *d = (const char *) dm; const char *d = (const char *) dm;
char *p; const char *p;
if (dmi_ident[slot]) if (dmi_ident[slot])
return; return;
...@@ -252,7 +252,7 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) ...@@ -252,7 +252,7 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
struct dmi_device *dev; struct dmi_device *dev;
for (i = 1; i <= count; i++) { for (i = 1; i <= count; i++) {
char *devname = dmi_string(dm, i); const char *devname = dmi_string(dm, i);
if (devname == dmi_empty_string) if (devname == dmi_empty_string)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment