evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source 
Pull x86 platform changes from Ingo Molnar:
 "Small fixes and cleanups all over the map"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/setup: Drop unneeded include <asm/dmi.h>
  x86/olpc/xo1/sci: Don't call input_free_device() after input_unregister_device()
  x86/platform/intel/mrst: Remove cast for kmalloc() return value
  x86/platform/uv: Replace kmalloc() & memset with kzalloc()
This commit is contained in:
Linus Torvalds 2013-04-30 08:42:11 -07:00
commit 74c7d2f520
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/kernel/setup.c
View file

@ -82,7 +82,6 @@
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/dmi.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/ist.h> #include <asm/ist.h>
#include <asm/setup_arch.h> #include <asm/setup_arch.h>

3
arch/x86/platform/mrst/mrst.c
View file

@ -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); num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
pentry = (struct sfi_gpio_table_entry *)sb->pentry; pentry = (struct sfi_gpio_table_entry *)sb->pentry;
gpio_table = (struct sfi_gpio_table_entry *) gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
kmalloc(num * sizeof(*pentry), GFP_KERNEL);
if (!gpio_table) if (!gpio_table)
return -1; return -1;
memcpy(gpio_table, pentry, num * sizeof(*pentry)); memcpy(gpio_table, pentry, num * sizeof(*pentry));

4
arch/x86/platform/olpc/olpc-xo1-sci.c
View file

@ -460,7 +460,6 @@ static int setup_power_button(struct platform_device *pdev)
static void free_power_button(void) static void free_power_button(void)
{ {
input_unregister_device(power_button_idev); input_unregister_device(power_button_idev);
input_free_device(power_button_idev);
} }
static int setup_ebook_switch(struct platform_device *pdev) 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) static void free_ebook_switch(void)
{ {
input_unregister_device(ebook_switch_idev); input_unregister_device(ebook_switch_idev);
input_free_device(ebook_switch_idev);
} }
static int setup_lid_switch(struct platform_device *pdev) 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: err_create_attr:
input_unregister_device(lid_switch_idev); input_unregister_device(lid_switch_idev);
lid_switch_idev = NULL;
err_register: err_register:
input_free_device(lid_switch_idev); input_free_device(lid_switch_idev);
return r; return r;
@ -535,7 +534,6 @@ static void free_lid_switch(void)
{ {
device_remove_file(&lid_switch_idev->dev, &dev_attr_lid_wake_mode); device_remove_file(&lid_switch_idev->dev, &dev_attr_lid_wake_mode);
input_unregister_device(lid_switch_idev); input_unregister_device(lid_switch_idev);
input_free_device(lid_switch_idev);
} }
static int xo1_sci_probe(struct platform_device *pdev) static int xo1_sci_probe(struct platform_device *pdev)

3
arch/x86/platform/uv/uv_time.c
View file

@ -159,10 +159,9 @@ static __init int uv_rtc_allocate_timers(void)
{ {
int cpu; 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) if (!blade_info)
return -ENOMEM; return -ENOMEM;
memset(blade_info, 0, uv_possible_blades * sizeof(void *));
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {
int nid = cpu_to_node(cpu); int nid = cpu_to_node(cpu);