aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/platform/x86/acerhdf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 91b16c8a45bd..c07623c85d7a 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -131,18 +131,18 @@ static const struct manualcmd mcmd = {
131}; 131};
132 132
133/* BIOS settings */ 133/* BIOS settings */
134struct bios_settings_t { 134struct bios_settings {
135 const char *vendor; 135 const char *vendor;
136 const char *product; 136 const char *product;
137 const char *version; 137 const char *version;
138 unsigned char fanreg; 138 u8 fanreg;
139 unsigned char tempreg; 139 u8 tempreg;
140 struct fancmd cmd; 140 struct fancmd cmd;
141 int mcmd_enable; 141 int mcmd_enable;
142}; 142};
143 143
144/* Register addresses and values for different BIOS versions */ 144/* Register addresses and values for different BIOS versions */
145static const struct bios_settings_t bios_tbl[] = { 145static const struct bios_settings bios_tbl[] = {
146 /* AOA110 */ 146 /* AOA110 */
147 {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00}, 0}, 147 {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00}, 0},
148 {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00}, 0}, 148 {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00}, 0},
@@ -256,7 +256,7 @@ static const struct bios_settings_t bios_tbl[] = {
256 {"", "", "", 0, 0, {0, 0}, 0} 256 {"", "", "", 0, 0, {0, 0}, 0}
257}; 257};
258 258
259static const struct bios_settings_t *bios_cfg __read_mostly; 259static const struct bios_settings *bios_cfg __read_mostly;
260 260
261/* 261/*
262 * this struct is used to instruct thermal layer to use bang_bang instead of 262 * this struct is used to instruct thermal layer to use bang_bang instead of
@@ -619,7 +619,7 @@ static int str_starts_with(const char *str, const char *start)
619static int acerhdf_check_hardware(void) 619static int acerhdf_check_hardware(void)
620{ 620{
621 char const *vendor, *version, *product; 621 char const *vendor, *version, *product;
622 const struct bios_settings_t *bt = NULL; 622 const struct bios_settings *bt = NULL;
623 623
624 /* get BIOS data */ 624 /* get BIOS data */
625 vendor = dmi_get_system_info(DMI_SYS_VENDOR); 625 vendor = dmi_get_system_info(DMI_SYS_VENDOR);