Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI EC: remove redundant code
  ACPI: Add D3 cold state
  ACPI: processor: fix processor_physically_present in UP kernel
  ACPI: Split out custom_method functionality into an own driver
  ACPI: Cleanup custom_method debug stuff
  ACPI EC: enable MSI workaround for Quanta laptops
  ACPICA: Update to version 20110413
  ACPICA: Execute an orphan _REG method under the EC device
  ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place
  ACPICA: Update internal address SpaceID for DataTable regions
  ACPICA: Add more methods eligible for NULL package element removal
  ACPICA: Split all internal Global Lock functions to new file - evglock
  ACPI: EC: add another DMI check for ASUS hardware
  ACPI EC: remove dead code
  ACPICA: Fix code divergence of global lock handling
  ACPICA: Use acpi_os_create_lock interface
  ACPI: osl, add acpi_os_create_lock interface
  ACPI:Fix goto flows in thermal-sys

2 files changed, 13 insertions, 13 deletions

diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index c16a27641ced..9b3afb6f0b13 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -200,8 +200,8 @@ static bool extra_features;
  * watching the output of address 0x4F (do an ec_transaction writing 0x33
  * into 0x4F and read a few bytes from the output, like so:
  *      u8 writeData = 0x33;
- *      ec_transaction(0x4F, &writeData, 1, buffer, 32, 0);
- * That address is labelled "fan1 table information" in the service manual.
+ *      ec_transaction(0x4F, &writeData, 1, buffer, 32);
+ * That address is labeled "fan1 table information" in the service manual.
  * It should be clear which value in 'buffer' changes). This seems to be
  * related to fan speed. It isn't a proper 'realtime' fan speed value
  * though, because physically stopping or speeding up the fan doesn't
@@ -286,7 +286,7 @@ static int get_backlight_level(void)
 static void set_backlight_state(bool on)
 {
         u8 data = on ? BACKLIGHT_STATE_ON_DATA : BACKLIGHT_STATE_OFF_DATA;
-        ec_transaction(BACKLIGHT_STATE_ADDR, &data, 1, NULL, 0, 0);
+        ec_transaction(BACKLIGHT_STATE_ADDR, &data, 1, NULL, 0);
 }
 
 
@@ -294,24 +294,24 @@ static void set_backlight_state(bool on)
 static void pwm_enable_control(void)
 {
         unsigned char writeData = PWM_ENABLE_DATA;
-        ec_transaction(PWM_ENABLE_ADDR, &writeData, 1, NULL, 0, 0);
+        ec_transaction(PWM_ENABLE_ADDR, &writeData, 1, NULL, 0);
 }
 
 static void pwm_disable_control(void)
 {
         unsigned char writeData = PWM_DISABLE_DATA;
-        ec_transaction(PWM_DISABLE_ADDR, &writeData, 1, NULL, 0, 0);
+        ec_transaction(PWM_DISABLE_ADDR, &writeData, 1, NULL, 0);
 }
 
 static void set_pwm(int pwm)
 {
-        ec_transaction(PWM_ADDRESS, &pwm_lookup_table[pwm], 1, NULL, 0, 0);
+        ec_transaction(PWM_ADDRESS, &pwm_lookup_table[pwm], 1, NULL, 0);
 }
 
 static int get_fan_rpm(void)
 {
         u8 value, data = FAN_DATA;
-        ec_transaction(FAN_ADDRESS, &data, 1, &value, 1, 0);
+        ec_transaction(FAN_ADDRESS, &data, 1, &value, 1);
         return 100 * (int)value;
 }
 
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 23fb2afda00b..821ad7bc1e26 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -135,7 +135,7 @@ static int set_lcd_level(int level)
         buf[1] = (u8) (level*31);
 
         return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, buf, sizeof(buf),
-                              NULL, 0, 1);
+                              NULL, 0);
 }
 
 static int get_lcd_level(void)
@@ -144,7 +144,7 @@ static int get_lcd_level(void)
         int result;
 
         result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1,
-                                &rdata, 1, 1);
+                                &rdata, 1);
         if (result < 0)
                 return result;
 
@@ -157,7 +157,7 @@ static int get_auto_brightness(void)
         int result;
 
         result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, &wdata, 1,
-                                &rdata, 1, 1);
+                                &rdata, 1);
         if (result < 0)
                 return result;
 
@@ -172,7 +172,7 @@ static int set_auto_brightness(int enable)
         wdata[0] = 4;
 
         result = ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 1,
-                                &rdata, 1, 1);
+                                &rdata, 1);
         if (result < 0)
                 return result;
 
@@ -180,7 +180,7 @@ static int set_auto_brightness(int enable)
         wdata[1] = (rdata & 0xF7) | (enable ? 8 : 0);
 
         return ec_transaction(MSI_EC_COMMAND_LCD_LEVEL, wdata, 2,
-                              NULL, 0, 1);
+                              NULL, 0);
 }
 
 static ssize_t set_device_state(const char *buf, size_t count, u8 mask)
@@ -217,7 +217,7 @@ static int get_wireless_state(int *wlan, int *bluetooth)
         u8 wdata = 0, rdata;
         int result;
 
-        result = ec_transaction(MSI_EC_COMMAND_WIRELESS, &wdata, 1, &rdata, 1, 1);
+        result = ec_transaction(MSI_EC_COMMAND_WIRELESS, &wdata, 1, &rdata, 1);
         if (result < 0)
                 return -1;