Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "Some significant updates to samsung-laptop, additional hardware
  support for Toshibas, misc updates to various hardware and a new
  backlight driver for some Apple machines."

Fix up trivial conflicts: geode Geos update happening next to net5501
support, and MSIC thermal platform support added twice.

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (77 commits)
  acer-wmi: add quirk table for video backlight vendor mode
  drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref
  samsung-laptop: unregister ACPI video module for some well known laptops
  acer-wmi: No wifi rfkill on Sony machines
  thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
  asus-wmi: don't update power and brightness when using scalar
  eeepc-wmi: split et2012 specific hacks
  eeepc-wmi: refine quirks handling
  asus-nb-wmi: set panel_power correctly
  asus-wmi: move WAPF variable into quirks_entry
  asus-wmi: store backlight power status for AIO machine
  asus-wmi: add scalar board brightness adj. support
  samsung-laptop: cleanup return type: mode_t vs umode_t
  drivers, samsung-laptop: fix usage of isalnum
  drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb
  asus-wmi: on/off bit is not set when reading the value
  eeepc-wmi: add extra keymaps for EP121
  asus-nb-wmi: ignore useless keys
  acer-wmi: support Lenovo ideapad S205 Brazos wifi switch
  acer-wmi: fix out of input parameter size when set
  ...

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 760c6d7624fe..bc8384c6f3eb 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -244,12 +244,11 @@ static void acerhdf_change_fanstate(int state)
         unsigned char cmd;
 
         if (verbose)
-                pr_notice("fan %s\n", (state == ACERHDF_FAN_OFF) ?
-                                "OFF" : "ON");
+                pr_notice("fan %s\n", state == ACERHDF_FAN_OFF ? "OFF" : "ON");
 
         if ((state != ACERHDF_FAN_OFF) && (state != ACERHDF_FAN_AUTO)) {
                 pr_err("invalid fan state %d requested, setting to auto!\n",
-                        state);
+                       state);
                 state = ACERHDF_FAN_AUTO;
         }
 
@@ -264,19 +263,18 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal)
 {
         if (fanon > ACERHDF_MAX_FANON) {
                 pr_err("fanon temperature too high, set to %d\n",
-                                ACERHDF_MAX_FANON);
+                       ACERHDF_MAX_FANON);
                 fanon = ACERHDF_MAX_FANON;
         }
 
         if (kernelmode && prev_interval != interval) {
                 if (interval > ACERHDF_MAX_INTERVAL) {
                         pr_err("interval too high, set to %d\n",
-                                ACERHDF_MAX_INTERVAL);
+                               ACERHDF_MAX_INTERVAL);
                         interval = ACERHDF_MAX_INTERVAL;
                 }
                 if (verbose)
-                        pr_notice("interval changed to: %d\n",
-                                        interval);
+                        pr_notice("interval changed to: %d\n", interval);
                 thermal->polling_delay = interval*1000;
                 prev_interval = interval;
         }
@@ -587,8 +585,8 @@ static int acerhdf_check_hardware(void)
         }
 
         if (!bios_cfg) {
-                pr_err("unknown (unsupported) BIOS version %s/%s/%s, "
-                        "please report, aborting!\n", vendor, product, version);
+                pr_err("unknown (unsupported) BIOS version %s/%s/%s, please report, aborting!\n",
+                       vendor, product, version);
                 return -EINVAL;
         }
 
@@ -598,8 +596,7 @@ static int acerhdf_check_hardware(void)
          */
         if (!kernelmode) {
                 pr_notice("Fan control off, to enable do:\n");
-                pr_notice("echo -n \"enabled\" > "
-                        "/sys/class/thermal/thermal_zone0/mode\n");
+                pr_notice("echo -n \"enabled\" > /sys/class/thermal/thermal_zone0/mode\n");
         }
 
         return 0;