Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c75dd0f authored by Julia Lawall's avatar Julia Lawall Committed by Matthew Garrett
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
parent 420f5f0c

drivers/platform/x86/fujitsu-laptop.c

+2 −4
Original line number Diff line number Diff line
@@ -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) {