aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-13 16:06:20 -0400
committerMatthew Garrett <mjg@redhat.com>2010-05-20 09:26:13 -0400
commit6c75dd0f965b7b3480d0e0e9b8d9747988dfe815 (patch)
tree2135b6487e7931f663f278d0d144683957f8f126 /drivers/platform
parent420f5f0c5aeb3ff47cf220e7b256f8fec327659c (diff)
drivers/platform/x86: Use kzalloc
Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 47b4fd75aa34..e325aeb37d2e 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1090,10 +1090,9 @@ static int __init fujitsu_init(void)
1090 if (acpi_disabled) 1090 if (acpi_disabled)
1091 return -ENODEV; 1091 return -ENODEV;
1092 1092
1093 fujitsu = kmalloc(sizeof(struct fujitsu_t), GFP_KERNEL); 1093 fujitsu = kzalloc(sizeof(struct fujitsu_t), GFP_KERNEL);
1094 if (!fujitsu) 1094 if (!fujitsu)
1095 return -ENOMEM; 1095 return -ENOMEM;
1096 memset(fujitsu, 0, sizeof(struct fujitsu_t));
1097 fujitsu->keycode1 = KEY_PROG1; 1096 fujitsu->keycode1 = KEY_PROG1;
1098 fujitsu->keycode2 = KEY_PROG2; 1097 fujitsu->keycode2 = KEY_PROG2;
1099 fujitsu->keycode3 = KEY_PROG3; 1098 fujitsu->keycode3 = KEY_PROG3;
@@ -1150,12 +1149,11 @@ static int __init fujitsu_init(void)
1150 1149
1151 /* Register hotkey driver */ 1150 /* Register hotkey driver */
1152 1151
1153 fujitsu_hotkey = kmalloc(sizeof(struct fujitsu_hotkey_t), GFP_KERNEL); 1152 fujitsu_hotkey = kzalloc(sizeof(struct fujitsu_hotkey_t), GFP_KERNEL);
1154 if (!fujitsu_hotkey) { 1153 if (!fujitsu_hotkey) {
1155 ret = -ENOMEM; 1154 ret = -ENOMEM;
1156 goto fail_hotkey; 1155 goto fail_hotkey;
1157 } 1156 }
1158 memset(fujitsu_hotkey, 0, sizeof(struct fujitsu_hotkey_t));
1159 1157
1160 result = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver); 1158 result = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver);
1161 if (result < 0) { 1159 if (result < 0) {