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: (68 commits)
  ACPI: replace kmalloc+memset with kzalloc
  ACPI: Add support for acpi_load_table/acpi_unload_table_id
  fbdev: update after backlight argument change
  ACPI: video: Add dev argument for backlight_device_register
  ACPI: Implement acpi_video_get_next_level()
  ACPI: Kconfig - depend on PM rather than selecting it
  ACPI: fix NULL check in drivers/acpi/osl.c
  ACPI: make drivers/acpi/ec.c:ec_ecdt static
  ACPI: prevent processor module from loading on failures
  ACPI: fix single linked list manipulation
  ACPI: ibm_acpi: allow clean removal
  ACPI: fix git automerge failure
  ACPI: ibm_acpi: respond to workqueue update
  ACPI: dock: add uevent to indicate change in device status
  ACPI: ec: Lindent once again
  ACPI: ec: Change #define to enums there possible.
  ACPI: ec: Style changes.
  ACPI: ec: Acquire Global Lock under EC mutex.
  ACPI: ec: Drop udelay() from poll mode. Loop by reading status field instead.
  ACPI: ec: Rename gpe_bit to gpe
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 6dac6050bb5a..3f30af21574e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -681,7 +681,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 return -ENODEV;
         }
 
-        cst = (union acpi_object *)buffer.pointer;
+        cst = buffer.pointer;
 
         /* There must be at least 2 elements */
         if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
@@ -710,14 +710,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
                 memset(&cx, 0, sizeof(cx));
 
-                element = (union acpi_object *)&(cst->package.elements[i]);
+                element = &(cst->package.elements[i]);
                 if (element->type != ACPI_TYPE_PACKAGE)
                         continue;
 
                 if (element->package.count != 4)
                         continue;
 
-                obj = (union acpi_object *)&(element->package.elements[0]);
+                obj = &(element->package.elements[0]);
 
                 if (obj->type != ACPI_TYPE_BUFFER)
                         continue;
@@ -729,7 +729,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                         continue;
 
                 /* There should be an easy way to extract an integer... */
-                obj = (union acpi_object *)&(element->package.elements[1]);
+                obj = &(element->package.elements[1]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -762,13 +762,13 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                         }
                 }
 
-                obj = (union acpi_object *)&(element->package.elements[2]);
+                obj = &(element->package.elements[2]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
                 cx.latency = obj->integer.value;
 
-                obj = (union acpi_object *)&(element->package.elements[3]);
+                obj = &(element->package.elements[3]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -1037,7 +1037,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
         unsigned int i;