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/isdn/gigaset/usb-gigaset.c | |
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/isdn/gigaset/usb-gigaset.c')
-rw-r--r-- | drivers/isdn/gigaset/usb-gigaset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c index af89ce188f2a..04f2ad7ba8b0 100644 --- a/drivers/isdn/gigaset/usb-gigaset.c +++ b/drivers/isdn/gigaset/usb-gigaset.c | |||
@@ -763,7 +763,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
763 | goto error; | 763 | goto error; |
764 | } | 764 | } |
765 | 765 | ||
766 | ucs->bulk_out_urb = usb_alloc_urb(0, SLAB_KERNEL); | 766 | ucs->bulk_out_urb = usb_alloc_urb(0, GFP_KERNEL); |
767 | if (!ucs->bulk_out_urb) { | 767 | if (!ucs->bulk_out_urb) { |
768 | dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n"); | 768 | dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n"); |
769 | retval = -ENOMEM; | 769 | retval = -ENOMEM; |
@@ -774,7 +774,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
774 | 774 | ||
775 | atomic_set(&ucs->busy, 0); | 775 | atomic_set(&ucs->busy, 0); |
776 | 776 | ||
777 | ucs->read_urb = usb_alloc_urb(0, SLAB_KERNEL); | 777 | ucs->read_urb = usb_alloc_urb(0, GFP_KERNEL); |
778 | if (!ucs->read_urb) { | 778 | if (!ucs->read_urb) { |
779 | dev_err(cs->dev, "No free urbs available\n"); | 779 | dev_err(cs->dev, "No free urbs available\n"); |
780 | retval = -ENOMEM; | 780 | retval = -ENOMEM; |
@@ -797,7 +797,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
797 | gigaset_read_int_callback, | 797 | gigaset_read_int_callback, |
798 | cs->inbuf + 0, endpoint->bInterval); | 798 | cs->inbuf + 0, endpoint->bInterval); |
799 | 799 | ||
800 | retval = usb_submit_urb(ucs->read_urb, SLAB_KERNEL); | 800 | retval = usb_submit_urb(ucs->read_urb, GFP_KERNEL); |
801 | if (retval) { | 801 | if (retval) { |
802 | dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval); | 802 | dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval); |
803 | goto error; | 803 | goto error; |