drivers/platform/x86: Use kzalloc
authorJulia Lawall <julia@diku.dk>
Thu, 13 May 2010 20:06:20 +0000 (22:06 +0200)
committerMatthew Garrett <mjg@redhat.com>
Thu, 20 May 2010 13:26:13 +0000 (09:26 -0400)
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>
drivers/platform/x86/fujitsu-laptop.c

index 47b4fd7..e325aeb 100644 (file)
@@ -1090,10 +1090,9 @@ static int __init fujitsu_init(void)
        if (acpi_disabled)
                return -ENODEV;
 
-       fujitsu = kmalloc(sizeof(struct fujitsu_t), GFP_KERNEL);
+       fujitsu = kzalloc(sizeof(struct fujitsu_t), GFP_KERNEL);
        if (!fujitsu)
                return -ENOMEM;
-       memset(fujitsu, 0, sizeof(struct fujitsu_t));
        fujitsu->keycode1 = KEY_PROG1;
        fujitsu->keycode2 = KEY_PROG2;
        fujitsu->keycode3 = KEY_PROG3;
@@ -1150,12 +1149,11 @@ static int __init fujitsu_init(void)
 
        /* Register hotkey driver */
 
-       fujitsu_hotkey = kmalloc(sizeof(struct fujitsu_hotkey_t), GFP_KERNEL);
+       fujitsu_hotkey = kzalloc(sizeof(struct fujitsu_hotkey_t), GFP_KERNEL);
        if (!fujitsu_hotkey) {
                ret = -ENOMEM;
                goto fail_hotkey;
        }
-       memset(fujitsu_hotkey, 0, sizeof(struct fujitsu_hotkey_t));
 
        result = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver);
        if (result < 0) {