drivers/platform/x86: Use kzalloc
in [Kernel]
|
Prev: linux-next: manual merge of the ceph tree with Linus' tree
Next: linux-next: manual merge of the ceph tree with Linus' tree
From: Jonathan Woithe on 13 May 2010 20:10 All good from my POV. Acked-by: Jonathan Woithe <jwoithe(a)physics.adelaide.edu.au> > From: Julia Lawall <julia(a)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(a)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) { > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Matthew Garrett on 20 May 2010 09:30
Thanks, applied. -- Matthew Garrett | mjg59(a)srcf.ucam.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |