* [PATCH 16/20] drivers/platform/x86: Use kzalloc
@ 2010-05-13 20:06 Julia Lawall
2010-05-14 0:01 ` Jonathan Woithe
2010-05-20 13:26 ` Matthew Garrett
0 siblings, 2 replies; 3+ messages in thread
From: Julia Lawall @ 2010-05-13 20:06 UTC (permalink / raw)
To: Jonathan Woithe, Matthew Garrett, platform-driver-x86,
linux-kernel, kernel-janitors
From: Julia Lawall <julia@diku.dk>
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 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -u -p a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -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) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 16/20] drivers/platform/x86: Use kzalloc
2010-05-13 20:06 [PATCH 16/20] drivers/platform/x86: Use kzalloc Julia Lawall
@ 2010-05-14 0:01 ` Jonathan Woithe
2010-05-20 13:26 ` Matthew Garrett
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Woithe @ 2010-05-14 0:01 UTC (permalink / raw)
To: Julia Lawall
Cc: Jonathan Woithe, Matthew Garrett, platform-driver-x86,
linux-kernel, kernel-janitors
All good from my POV.
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
> From: Julia Lawall <julia@diku.dk>
>
> 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 | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff -u -p a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -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) {
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 16/20] drivers/platform/x86: Use kzalloc
2010-05-13 20:06 [PATCH 16/20] drivers/platform/x86: Use kzalloc Julia Lawall
2010-05-14 0:01 ` Jonathan Woithe
@ 2010-05-20 13:26 ` Matthew Garrett
1 sibling, 0 replies; 3+ messages in thread
From: Matthew Garrett @ 2010-05-20 13:26 UTC (permalink / raw)
To: Julia Lawall
Cc: Jonathan Woithe, platform-driver-x86, linux-kernel,
kernel-janitors
Thanks, applied.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-20 13:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-13 20:06 [PATCH 16/20] drivers/platform/x86: Use kzalloc Julia Lawall
2010-05-14 0:01 ` Jonathan Woithe
2010-05-20 13:26 ` Matthew Garrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).