GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-02 20:29:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

firmware: dmi_scan: Use direct access to static vars

Browse source 
There is no reason to pass static vars to function that can use
only them.

The dmi_table() can use only dmi_len and dmi_num static vars, so use
them directly. In this case we can freely change their type in one
place and slightly decrease redundancy.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Ivan Khoronzhuk 2015-02-18 13:33:21 +02:00 • committed by Matt Fleming
parent 95be58df74
commit 552e19d876
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/firmware/dmi_scan.c
View file

@ -18,6 +18,8 @@
static const char dmi_empty_string[] = " "; static const char dmi_empty_string[] = " ";
static u32 dmi_ver __initdata; static u32 dmi_ver __initdata;
static u32 dmi_len;
static u16 dmi_num;
/* /*
* Catch too early calls to dmi_check_system(): * Catch too early calls to dmi_check_system():
*/ */
@ -78,7 +80,7 @@ static const char * __init dmi_string(const struct dmi_header *dm, u8 s)
* We have to be cautious here. We have seen BIOSes with DMI pointers * We have to be cautious here. We have seen BIOSes with DMI pointers
* pointing to completely the wrong place for example * pointing to completely the wrong place for example
*/ */
static void dmi_table(u8 *buf, u32 len, int num, static void dmi_table(u8 *buf,
void (*decode)(const struct dmi_header *, void *), void (*decode)(const struct dmi_header *, void *),
void *private_data) void *private_data)
{ {
@ -89,7 +91,8 @@ static void dmi_table(u8 *buf, u32 len, int num,
* Stop when we see all the items the table claimed to have * Stop when we see all the items the table claimed to have
* OR we run off the end of the table (also happens) * OR we run off the end of the table (also happens)
*/ */
while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) { while ((i < dmi_num) && (data - buf + sizeof(struct dmi_header))
<= dmi_len) {
const struct dmi_header *dm = (const struct dmi_header *)data; const struct dmi_header *dm = (const struct dmi_header *)data;
/* /*
@ -98,9 +101,9 @@ static void dmi_table(u8 *buf, u32 len, int num,
* table in dmi_decode or dmi_string * table in dmi_decode or dmi_string
*/ */
data += dm->length; data += dm->length;
while ((data - buf < len - 1) && (data[0] || data[1])) while ((data - buf < dmi_len - 1) && (data[0] || data[1]))
data++; data++;
if (data - buf < len - 1) if (data - buf < dmi_len - 1)
decode(dm, private_data); decode(dm, private_data);
/* /*
@ -115,8 +118,6 @@ static void dmi_table(u8 *buf, u32 len, int num,
} }
static phys_addr_t dmi_base; static phys_addr_t dmi_base;
static u32 dmi_len;
static u16 dmi_num;
static int __init dmi_walk_early(void (*decode)(const struct dmi_header *, static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
void *)) void *))
@ -127,7 +128,7 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
if (buf == NULL) if (buf == NULL)
return -1; return -1;
dmi_table(buf, dmi_len, dmi_num, decode, NULL); dmi_table(buf, decode, NULL);
add_device_randomness(buf, dmi_len); add_device_randomness(buf, dmi_len);
@ -905,7 +906,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
if (buf == NULL) if (buf == NULL)
return -1; return -1;
dmi_table(buf, dmi_len, dmi_num, decode, private_data); dmi_table(buf, decode, private_data);
dmi_unmap(buf); dmi_unmap(buf);
return 0; return 0;