dmi: Let dmi_walk() users pass private data
At the moment, dmi_walk() lacks flexibility, users can't pass data to the callback function. Add a pointer for private data to make this function more flexible. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Matthew Garrett <mjg@redhat.com> Cc: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Родитель
ec19920944
Коммит
e7a19c5624
|
@ -68,7 +68,8 @@ static char * __init dmi_string(const struct dmi_header *dm, u8 s)
|
|||
* pointing to completely the wrong place for example
|
||||
*/
|
||||
static void dmi_table(u8 *buf, int len, int num,
|
||||
void (*decode)(const struct dmi_header *))
|
||||
void (*decode)(const struct dmi_header *, void *),
|
||||
void *private_data)
|
||||
{
|
||||
u8 *data = buf;
|
||||
int i = 0;
|
||||
|
@ -89,7 +90,7 @@ static void dmi_table(u8 *buf, int len, int num,
|
|||
while ((data - buf < len - 1) && (data[0] || data[1]))
|
||||
data++;
|
||||
if (data - buf < len - 1)
|
||||
decode(dm);
|
||||
decode(dm, private_data);
|
||||
data += 2;
|
||||
i++;
|
||||
}
|
||||
|
@ -99,7 +100,8 @@ static u32 dmi_base;
|
|||
static u16 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 *))
|
||||
{
|
||||
u8 *buf;
|
||||
|
||||
|
@ -107,7 +109,7 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *))
|
|||
if (buf == NULL)
|
||||
return -1;
|
||||
|
||||
dmi_table(buf, dmi_len, dmi_num, decode);
|
||||
dmi_table(buf, dmi_len, dmi_num, decode, NULL);
|
||||
|
||||
dmi_iounmap(buf, dmi_len);
|
||||
return 0;
|
||||
|
@ -295,7 +297,7 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm)
|
|||
* and machine entries. For 2.5 we should pull the smbus controller info
|
||||
* out of here.
|
||||
*/
|
||||
static void __init dmi_decode(const struct dmi_header *dm)
|
||||
static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
|
||||
{
|
||||
switch(dm->type) {
|
||||
case 0: /* BIOS Information */
|
||||
|
@ -598,10 +600,12 @@ int dmi_get_year(int field)
|
|||
/**
|
||||
* dmi_walk - Walk the DMI table and get called back for every record
|
||||
* @decode: Callback function
|
||||
* @private_data: Private data to be passed to the callback function
|
||||
*
|
||||
* Returns -1 when the DMI table can't be reached, 0 on success.
|
||||
*/
|
||||
int dmi_walk(void (*decode)(const struct dmi_header *))
|
||||
int dmi_walk(void (*decode)(const struct dmi_header *, void *),
|
||||
void *private_data)
|
||||
{
|
||||
u8 *buf;
|
||||
|
||||
|
@ -612,7 +616,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *))
|
|||
if (buf == NULL)
|
||||
return -1;
|
||||
|
||||
dmi_table(buf, dmi_len, dmi_num, decode);
|
||||
dmi_table(buf, dmi_len, dmi_num, decode, private_data);
|
||||
|
||||
iounmap(buf);
|
||||
return 0;
|
||||
|
|
|
@ -856,7 +856,7 @@ static struct file_operations watchdog_fops = {
|
|||
|
||||
/* DMI decode routine to read voltage scaling factors from special DMI tables,
|
||||
which are available on FSC machines with an fscher or later chip. */
|
||||
static void fschmd_dmi_decode(const struct dmi_header *header)
|
||||
static void fschmd_dmi_decode(const struct dmi_header *header, void *dummy)
|
||||
{
|
||||
int i, mult[3] = { 0 }, offset[3] = { 0 }, vref = 0, found = 0;
|
||||
|
||||
|
@ -991,7 +991,7 @@ static int fschmd_probe(struct i2c_client *client,
|
|||
|
||||
/* Read the special DMI table for fscher and newer chips */
|
||||
if ((kind == fscher || kind >= fschrc) && dmi_vref == -1) {
|
||||
dmi_walk(fschmd_dmi_decode);
|
||||
dmi_walk(fschmd_dmi_decode, NULL);
|
||||
if (dmi_vref == -1) {
|
||||
dev_warn(&client->dev,
|
||||
"Couldn't get voltage scaling factors from "
|
||||
|
|
|
@ -103,7 +103,7 @@ static void parse_da_table(const struct dmi_header *dm)
|
|||
da_num_tokens += tokens;
|
||||
}
|
||||
|
||||
static void find_tokens(const struct dmi_header *dm)
|
||||
static void find_tokens(const struct dmi_header *dm, void *dummy)
|
||||
{
|
||||
switch (dm->type) {
|
||||
case 0xd4: /* Indexed IO */
|
||||
|
@ -356,7 +356,7 @@ static int __init dell_init(void)
|
|||
if (!dmi_check_system(dell_device_table))
|
||||
return -ENODEV;
|
||||
|
||||
dmi_walk(find_tokens);
|
||||
dmi_walk(find_tokens, NULL);
|
||||
|
||||
if (!da_tokens) {
|
||||
printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");
|
||||
|
|
|
@ -380,7 +380,7 @@ asm(".text \n\t"
|
|||
* This function checks whether or not a SMBIOS/DMI record is
|
||||
* the 64bit CRU info or not
|
||||
*/
|
||||
static void __devinit dmi_find_cru(const struct dmi_header *dm)
|
||||
static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy)
|
||||
{
|
||||
struct smbios_cru64_info *smbios_cru64_ptr;
|
||||
unsigned long cru_physical_address;
|
||||
|
@ -403,7 +403,7 @@ static int __devinit detect_cru_service(void)
|
|||
{
|
||||
cru_rom_addr = NULL;
|
||||
|
||||
dmi_walk(dmi_find_cru);
|
||||
dmi_walk(dmi_find_cru, NULL);
|
||||
|
||||
/* if cru_rom_addr has been set then we found a CRU service */
|
||||
return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
|
||||
|
|
|
@ -47,7 +47,8 @@ extern int dmi_get_year(int field);
|
|||
extern int dmi_name_in_vendors(const char *str);
|
||||
extern int dmi_name_in_serial(const char *str);
|
||||
extern int dmi_available;
|
||||
extern int dmi_walk(void (*decode)(const struct dmi_header *));
|
||||
extern int dmi_walk(void (*decode)(const struct dmi_header *, void *),
|
||||
void *private_data);
|
||||
extern bool dmi_match(enum dmi_field f, const char *str);
|
||||
|
||||
#else
|
||||
|
@ -61,8 +62,8 @@ static inline int dmi_get_year(int year) { return 0; }
|
|||
static inline int dmi_name_in_vendors(const char *s) { return 0; }
|
||||
static inline int dmi_name_in_serial(const char *s) { return 0; }
|
||||
#define dmi_available 0
|
||||
static inline int dmi_walk(void (*decode)(const struct dmi_header *))
|
||||
{ return -1; }
|
||||
static inline int dmi_walk(void (*decode)(const struct dmi_header *, void *),
|
||||
void *private_data) { return -1; }
|
||||
static inline bool dmi_match(enum dmi_field f, const char *str)
|
||||
{ return false; }
|
||||
static inline const struct dmi_system_id *
|
||||
|
|
Загрузка…
Ссылка в новой задаче