diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/spi | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi.c | 4 | ||||
-rw-r--r-- | drivers/spi/spi_bitbang.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c3c0626f550b..09f2c74a40c5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -360,7 +360,7 @@ spi_alloc_master(struct device *dev, unsigned size) | |||
360 | if (!dev) | 360 | if (!dev) |
361 | return NULL; | 361 | return NULL; |
362 | 362 | ||
363 | master = kzalloc(size + sizeof *master, SLAB_KERNEL); | 363 | master = kzalloc(size + sizeof *master, GFP_KERNEL); |
364 | if (!master) | 364 | if (!master) |
365 | return NULL; | 365 | return NULL; |
366 | 366 | ||
@@ -607,7 +607,7 @@ static int __init spi_init(void) | |||
607 | { | 607 | { |
608 | int status; | 608 | int status; |
609 | 609 | ||
610 | buf = kmalloc(SPI_BUFSIZ, SLAB_KERNEL); | 610 | buf = kmalloc(SPI_BUFSIZ, GFP_KERNEL); |
611 | if (!buf) { | 611 | if (!buf) { |
612 | status = -ENOMEM; | 612 | status = -ENOMEM; |
613 | goto err0; | 613 | goto err0; |
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index 08c1c57c6128..57289b61d0be 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c | |||
@@ -196,7 +196,7 @@ int spi_bitbang_setup(struct spi_device *spi) | |||
196 | return -EINVAL; | 196 | return -EINVAL; |
197 | 197 | ||
198 | if (!cs) { | 198 | if (!cs) { |
199 | cs = kzalloc(sizeof *cs, SLAB_KERNEL); | 199 | cs = kzalloc(sizeof *cs, GFP_KERNEL); |
200 | if (!cs) | 200 | if (!cs) |
201 | return -ENOMEM; | 201 | return -ENOMEM; |
202 | spi->controller_state = cs; | 202 | spi->controller_state = cs; |