aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/platform/x86/eeepc-laptop.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index bb098e547121..6e3be01ca011 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -417,8 +417,7 @@ static ssize_t cpufv_disabled_store(struct device *dev,
417 switch (value) { 417 switch (value) {
418 case 0: 418 case 0:
419 if (eeepc->cpufv_disabled) 419 if (eeepc->cpufv_disabled)
420 pr_warn("cpufv enabled (not officially supported " 420 pr_warn("cpufv enabled (not officially supported on this model)\n");
421 "on this model)\n");
422 eeepc->cpufv_disabled = false; 421 eeepc->cpufv_disabled = false;
423 return count; 422 return count;
424 case 1: 423 case 1:
@@ -604,12 +603,10 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
604 absent = (l == 0xffffffff); 603 absent = (l == 0xffffffff);
605 604
606 if (blocked != absent) { 605 if (blocked != absent) {
607 pr_warn("BIOS says wireless lan is %s, " 606 pr_warn("BIOS says wireless lan is %s, but the pci device is %s\n",
608 "but the pci device is %s\n",
609 blocked ? "blocked" : "unblocked", 607 blocked ? "blocked" : "unblocked",
610 absent ? "absent" : "present"); 608 absent ? "absent" : "present");
611 pr_warn("skipped wireless hotplug as probably " 609 pr_warn("skipped wireless hotplug as probably inappropriate for this model\n");
612 "inappropriate for this model\n");
613 goto out_put_dev; 610 goto out_put_dev;
614 } 611 }
615 612
@@ -1295,8 +1292,8 @@ static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
1295 */ 1292 */
1296 if (strcmp(model, "701") == 0 || strcmp(model, "702") == 0) { 1293 if (strcmp(model, "701") == 0 || strcmp(model, "702") == 0) {
1297 eeepc->cpufv_disabled = true; 1294 eeepc->cpufv_disabled = true;
1298 pr_info("model %s does not officially support setting cpu " 1295 pr_info("model %s does not officially support setting cpu speed\n",
1299 "speed\n", model); 1296 model);
1300 pr_info("cpufv disabled to avoid instability\n"); 1297 pr_info("cpufv disabled to avoid instability\n");
1301 } 1298 }
1302 1299
@@ -1322,8 +1319,8 @@ static void cmsg_quirk(struct eeepc_laptop *eeepc, int cm, const char *name)
1322 Check if cm_getv[cm] works and, if yes, assume cm should be set. */ 1319 Check if cm_getv[cm] works and, if yes, assume cm should be set. */
1323 if (!(eeepc->cm_supported & (1 << cm)) 1320 if (!(eeepc->cm_supported & (1 << cm))
1324 && !read_acpi_int(eeepc->handle, cm_getv[cm], &dummy)) { 1321 && !read_acpi_int(eeepc->handle, cm_getv[cm], &dummy)) {
1325 pr_info("%s (%x) not reported by BIOS," 1322 pr_info("%s (%x) not reported by BIOS, enabling anyway\n",
1326 " enabling anyway\n", name, 1 << cm); 1323 name, 1 << cm);
1327 eeepc->cm_supported |= 1 << cm; 1324 eeepc->cm_supported |= 1 << cm;
1328 } 1325 }
1329} 1326}