aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Yanfei <zhangyanfei@cn.fujitsu.com>2013-03-12 00:58:02 -0400
committerIngo Molnar <mingo@kernel.org>2013-03-12 04:10:20 -0400
commitad0304cfd90f46bfcae3a6cd2b69067741541730 (patch)
tree3b9bd93cc778f0e294b170e3f6402223d2e073df
parente87b686b5109e171438a0529828d3109b7ad6da3 (diff)
x86/platform/intel/mrst: Remove cast for kmalloc() return value
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Cc: Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/r/513EB5DA.2010300@cn.fujitsu.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/platform/mrst/mrst.c3
1 files changed, 1 insertions, 2 deletions
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)
356 num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry); 356 num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
357 pentry = (struct sfi_gpio_table_entry *)sb->pentry; 357 pentry = (struct sfi_gpio_table_entry *)sb->pentry;
358 358
359 gpio_table = (struct sfi_gpio_table_entry *) 359 gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
360 kmalloc(num * sizeof(*pentry), GFP_KERNEL);
361 if (!gpio_table) 360 if (!gpio_table)
362 return -1; 361 return -1;
363 memcpy(gpio_table, pentry, num * sizeof(*pentry)); 362 memcpy(gpio_table, pentry, num * sizeof(*pentry));