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

Commit 57181784 authored by Pekka J Enberg's avatar Pekka J Enberg Committed by Linus Torvalds
Browse files

[PATCH] msi: use kmem_cache_zalloc() 



Simpler, cleaner.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7583ddfd

drivers/pci/msi.c

+3 −10
Original line number Diff line number Diff line
@@ -45,16 +45,10 @@ msi_register(struct msi_ops *ops) 
	return 0;

}



static void msi_cache_ctor(void *p, kmem_cache_t *cache, unsigned long flags)

{

	memset(p, 0, sizeof(struct msi_desc));

}



static int msi_cache_init(void)

{

	msi_cachep = kmem_cache_create("msi_cache",

			sizeof(struct msi_desc),

		       	0, SLAB_HWCACHE_ALIGN, msi_cache_ctor, NULL);

	msi_cachep = kmem_cache_create("msi_cache", sizeof(struct msi_desc),

					0, SLAB_HWCACHE_ALIGN, NULL, NULL);

	if (!msi_cachep)

		return -ENOMEM;
@@ -402,11 +396,10 @@ static struct msi_desc* alloc_msi_entry(void) 
{

	struct msi_desc *entry;



	entry = kmem_cache_alloc(msi_cachep, SLAB_KERNEL);

	entry = kmem_cache_zalloc(msi_cachep, GFP_KERNEL);

	if (!entry)

		return NULL;



	memset(entry, 0, sizeof(struct msi_desc));

	entry->link.tail = entry->link.head = 0;	/* single message */

	entry->dev = NULL;