Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>

4 files changed, 25 insertions, 24 deletions

diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index 57d81c713eab..a9d5228724a6 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -281,7 +281,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,
 
 static int read_wireless_status(int mask)
 {
-        ulong status;
+        unsigned long long status;
         acpi_status rv = AE_OK;
 
         if (!wireless_status_handle)
@@ -298,7 +298,7 @@ static int read_wireless_status(int mask)
 
 static int read_gps_status(void)
 {
-        ulong status;
+        unsigned long long status;
         acpi_status rv = AE_OK;
 
         rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status);
@@ -405,7 +405,7 @@ static void lcd_blank(int blank)
 
 static int read_brightness(struct backlight_device *bd)
 {
-        ulong value;
+        unsigned long long value;
         acpi_status rv = AE_OK;
 
         rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value);
@@ -456,7 +456,7 @@ static ssize_t show_infos(struct device *dev,
                           struct device_attribute *attr, char *page)
 {
         int len = 0;
-        ulong temp;
+        unsigned long long temp;
         char buf[16];           //enough for all info
         acpi_status rv = AE_OK;
 
@@ -604,7 +604,7 @@ static void set_display(int value)
 
 static int read_display(void)
 {
-        ulong value = 0;
+        unsigned long long value = 0;
         acpi_status rv = AE_OK;
 
         /* In most of the case, we know how to set the display, but sometime
@@ -850,7 +850,7 @@ static int asus_hotk_get_info(void)
 {
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *model = NULL;
-        ulong bsts_result, hwrs_result;
+        unsigned long long bsts_result, hwrs_result;
         char *string = NULL;
         acpi_status status;
 
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 7b39e0f0f1be..9ef98b2d5039 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -231,7 +231,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,
 static int read_acpi_int(acpi_handle handle, const char *method, int *val)
 {
         acpi_status status;
-        ulong result;
+        unsigned long long result;
 
         status = acpi_evaluate_integer(handle, (char *)method, NULL, &result);
         if (ACPI_FAILURE(status)) {
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index 8555a17f00ef..d2cf0bfe3163 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -226,7 +226,7 @@ static int set_lcd_level_alt(int level)
 
 static int get_lcd_level(void)
 {
-        unsigned long state = 0;
+        unsigned long long state = 0;
         acpi_status status = AE_OK;
 
         vdbg_printk(FUJLAPTOP_DBG_TRACE, "get lcd level via GBLL\n");
@@ -248,7 +248,7 @@ static int get_lcd_level(void)
 
 static int get_max_brightness(void)
 {
-        unsigned long state = 0;
+        unsigned long long state = 0;
         acpi_status status = AE_OK;
 
         vdbg_printk(FUJLAPTOP_DBG_TRACE, "get max lcd level via RBLL\n");
@@ -265,7 +265,7 @@ static int get_max_brightness(void)
 
 static int get_lcd_level_alt(void)
 {
-        unsigned long state = 0;
+        unsigned long long state = 0;
         acpi_status status = AE_OK;
 
         vdbg_printk(FUJLAPTOP_DBG_TRACE, "get lcd level via GBLS\n");
@@ -386,7 +386,7 @@ static ssize_t store_lcd_level(struct device *dev,
 
 static int get_irb(void)
 {
-        unsigned long state = 0;
+        unsigned long long state = 0;
         acpi_status status = AE_OK;
 
         vdbg_printk(FUJLAPTOP_DBG_TRACE, "Get irb\n");
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index cd3ea7faa5b6..a78274385d54 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -57,7 +57,7 @@ static int memory_get_int_max_bandwidth(struct thermal_cooling_device *cdev,
 {
         struct acpi_device *device = cdev->devdata;
         acpi_handle handle = device->handle;
-        unsigned long value;
+        unsigned long long value;
         struct acpi_object_list arg_list;
         union acpi_object arg;
         acpi_status status = AE_OK;
@@ -90,7 +90,7 @@ static int memory_get_cur_bandwidth(struct thermal_cooling_device *cdev,
 {
         struct acpi_device *device = cdev->devdata;
         acpi_handle handle = device->handle;
-        unsigned long value;
+        unsigned long long value;
         struct acpi_object_list arg_list;
         union acpi_object arg;
         acpi_status status = AE_OK;
@@ -115,7 +115,7 @@ static int memory_set_cur_bandwidth(struct thermal_cooling_device *cdev,
         struct acpi_object_list arg_list;
         union acpi_object arg;
         acpi_status status;
-        int temp;
+        unsigned long long temp;
         unsigned long max_state;
 
         if (memory_get_int_max_bandwidth(cdev, &max_state))
@@ -131,7 +131,7 @@ static int memory_set_cur_bandwidth(struct thermal_cooling_device *cdev,
 
         status =
             acpi_evaluate_integer(handle, MEMORY_SET_BANDWIDTH, &arg_list,
-                                  (unsigned long *)&temp);
+                                  &temp);
 
         printk(KERN_INFO
                "Bandwidth value was %d: status is %d\n", state, status);
@@ -252,7 +252,8 @@ static DEFINE_MUTEX(intel_menlow_attr_lock);
  * @auxtype : AUX0/AUX1
  * @buf: syfs buffer
  */
-static int sensor_get_auxtrip(acpi_handle handle, int index, int *value)
+static int sensor_get_auxtrip(acpi_handle handle, int index,
+                                                        unsigned long long *value)
 {
         acpi_status status;
 
@@ -260,7 +261,7 @@ static int sensor_get_auxtrip(acpi_handle handle, int index, int *value)
                 return -EINVAL;
 
         status = acpi_evaluate_integer(handle, index ? GET_AUX1 : GET_AUX0,
-                                       NULL, (unsigned long *)value);
+                                       NULL, value);
         if (ACPI_FAILURE(status))
                 return -EIO;
 
@@ -282,13 +283,13 @@ static int sensor_set_auxtrip(acpi_handle handle, int index, int value)
         struct acpi_object_list args = {
                 1, &arg
         };
-        int temp;
+        unsigned long long temp;
 
         if (index != 0 && index != 1)
                 return -EINVAL;
 
         status = acpi_evaluate_integer(handle, index ? GET_AUX0 : GET_AUX1,
-                                       NULL, (unsigned long *)&temp);
+                                       NULL, &temp);
         if (ACPI_FAILURE(status))
                 return -EIO;
         if ((index && value < temp) || (!index && value > temp))
@@ -296,7 +297,7 @@ static int sensor_set_auxtrip(acpi_handle handle, int index, int value)
 
         arg.integer.value = value;
         status = acpi_evaluate_integer(handle, index ? SET_AUX1 : SET_AUX0,
-                                       &args, (unsigned long *)&temp);
+                                       &args, &temp);
         if (ACPI_FAILURE(status))
                 return -EIO;
 
@@ -312,7 +313,7 @@ static ssize_t aux0_show(struct device *dev,
                          struct device_attribute *dev_attr, char *buf)
 {
         struct intel_menlow_attribute *attr = to_intel_menlow_attr(dev_attr);
-        int value;
+        unsigned long long value;
         int result;
 
         result = sensor_get_auxtrip(attr->handle, 0, &value);
@@ -324,7 +325,7 @@ static ssize_t aux1_show(struct device *dev,
                          struct device_attribute *dev_attr, char *buf)
 {
         struct intel_menlow_attribute *attr = to_intel_menlow_attr(dev_attr);
-        int value;
+        unsigned long long value;
         int result;
 
         result = sensor_get_auxtrip(attr->handle, 1, &value);
@@ -376,7 +377,7 @@ static ssize_t bios_enabled_show(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
         acpi_status status;
-        unsigned long bios_enabled;
+        unsigned long long bios_enabled;
 
         status = acpi_evaluate_integer(NULL, BIOS_ENABLED, NULL, &bios_enabled);
         if (ACPI_FAILURE(status))
@@ -492,7 +493,7 @@ static int __init intel_menlow_module_init(void)
 {
         int result = -ENODEV;
         acpi_status status;
-        unsigned long enable;
+        unsigned long long enable;
 
         if (acpi_disabled)
                 return result;