1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9810e2a55d0a..adb0d2725731 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -147,7 +147,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
                 return -ENODEV;
         }
 
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
 
         /* Extract Package Data */
 
@@ -177,7 +177,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
         kfree(buffer.pointer);
 
         if (!result)
-                (*bif) = (struct acpi_battery_info *)data.pointer;
+                (*bif) = data.pointer;
 
         return result;
 }
@@ -207,7 +207,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
                 return -ENODEV;
         }
 
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
 
         /* Extract Package Data */
 
@@ -237,7 +237,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
         kfree(buffer.pointer);
 
         if (!result)
-                (*bst) = (struct acpi_battery_status *)data.pointer;
+                (*bst) = data.pointer;
 
         return result;
 }
@@ -332,7 +332,7 @@ static struct proc_dir_entry *acpi_battery_dir;
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
         int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         struct acpi_battery_info *bif = NULL;
         char *units = "?";
 
@@ -416,7 +416,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 {
         int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         struct acpi_battery_status *bst = NULL;
         char *units = "?";
 
@@ -492,7 +492,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         char *units = "?";
 
 
@@ -529,8 +529,8 @@ acpi_battery_write_alarm(struct file *file,
 {
         int result = 0;
         char alarm_string[12] = { '\0' };
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_battery *battery = (struct acpi_battery *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_battery *battery = m->private;
 
 
         if (!battery || (count > sizeof(alarm_string) - 1))
@@ -656,7 +656,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
 
 static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)data;
+        struct acpi_battery *battery = data;
         struct acpi_device *device = NULL;
 
 
@@ -740,7 +740,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        battery = (struct acpi_battery *)acpi_driver_data(device);
+        battery = acpi_driver_data(device);
 
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY,