4 files changed, 3 insertions, 8 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a5d550f2fa6e..4689855c2f8a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -82,7 +82,6 @@
 #include <asm/timer.h>
 #include <asm/i8259.h>
 #include <asm/sections.h>
-#include <asm/dmi.h>
 #include <asm/io_apic.h>
 #include <asm/ist.h>
 #include <asm/setup_arch.h>
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index e31bcd8f2eee..a0a0a4389bbd 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -356,8 +356,7 @@ static int __init sfi_parse_gpio(struct sfi_table_header *table)
         num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
         pentry = (struct sfi_gpio_table_entry *)sb->pentry;
 
-        gpio_table = (struct sfi_gpio_table_entry *)
-                                kmalloc(num * sizeof(*pentry), GFP_KERNEL);
+        gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
         if (!gpio_table)
                 return -1;
         memcpy(gpio_table, pentry, num * sizeof(*pentry));
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 74704be7b1fe..9a2e590dd202 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -460,7 +460,6 @@ static int setup_power_button(struct platform_device *pdev)
 static void free_power_button(void)
 {
         input_unregister_device(power_button_idev);
-        input_free_device(power_button_idev);
 }
 
 static int setup_ebook_switch(struct platform_device *pdev)
@@ -491,7 +490,6 @@ static int setup_ebook_switch(struct platform_device *pdev)
 static void free_ebook_switch(void)
 {
         input_unregister_device(ebook_switch_idev);
-        input_free_device(ebook_switch_idev);
 }
 
 static int setup_lid_switch(struct platform_device *pdev)
@@ -526,6 +524,7 @@ static int setup_lid_switch(struct platform_device *pdev)
 
 err_create_attr:
         input_unregister_device(lid_switch_idev);
+        lid_switch_idev = NULL;
 err_register:
         input_free_device(lid_switch_idev);
         return r;
@@ -535,7 +534,6 @@ static void free_lid_switch(void)
 {
         device_remove_file(&lid_switch_idev->dev, &dev_attr_lid_wake_mode);
         input_unregister_device(lid_switch_idev);
-        input_free_device(lid_switch_idev);
 }
 
 static int xo1_sci_probe(struct platform_device *pdev)
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 98718f604eb6..5c86786bbfd2 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -159,10 +159,9 @@ static __init int uv_rtc_allocate_timers(void)
 {
         int cpu;
 
-        blade_info = kmalloc(uv_possible_blades * sizeof(void *), GFP_KERNEL);
+        blade_info = kzalloc(uv_possible_blades * sizeof(void *), GFP_KERNEL);
         if (!blade_info)
                 return -ENOMEM;
-        memset(blade_info, 0, uv_possible_blades * sizeof(void *));
 
         for_each_present_cpu(cpu) {
                 int nid = cpu_to_node(cpu);