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/bas-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/bas-gigaset.c')
-rw-r--r-- | drivers/isdn/gigaset/bas-gigaset.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 5857e7e23f84..63b629b1cdb2 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c | |||
@@ -2218,21 +2218,21 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2218 | * - three for the different uses of the default control pipe | 2218 | * - three for the different uses of the default control pipe |
2219 | * - three for each isochronous pipe | 2219 | * - three for each isochronous pipe |
2220 | */ | 2220 | */ |
2221 | if (!(ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL)) || | 2221 | if (!(ucs->urb_int_in = usb_alloc_urb(0, GFP_KERNEL)) || |
2222 | !(ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL)) || | 2222 | !(ucs->urb_cmd_in = usb_alloc_urb(0, GFP_KERNEL)) || |
2223 | !(ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL)) || | 2223 | !(ucs->urb_cmd_out = usb_alloc_urb(0, GFP_KERNEL)) || |
2224 | !(ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL))) | 2224 | !(ucs->urb_ctrl = usb_alloc_urb(0, GFP_KERNEL))) |
2225 | goto allocerr; | 2225 | goto allocerr; |
2226 | 2226 | ||
2227 | for (j = 0; j < 2; ++j) { | 2227 | for (j = 0; j < 2; ++j) { |
2228 | ubc = cs->bcs[j].hw.bas; | 2228 | ubc = cs->bcs[j].hw.bas; |
2229 | for (i = 0; i < BAS_OUTURBS; ++i) | 2229 | for (i = 0; i < BAS_OUTURBS; ++i) |
2230 | if (!(ubc->isoouturbs[i].urb = | 2230 | if (!(ubc->isoouturbs[i].urb = |
2231 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) | 2231 | usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL))) |
2232 | goto allocerr; | 2232 | goto allocerr; |
2233 | for (i = 0; i < BAS_INURBS; ++i) | 2233 | for (i = 0; i < BAS_INURBS; ++i) |
2234 | if (!(ubc->isoinurbs[i] = | 2234 | if (!(ubc->isoinurbs[i] = |
2235 | usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL))) | 2235 | usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL))) |
2236 | goto allocerr; | 2236 | goto allocerr; |
2237 | } | 2237 | } |
2238 | 2238 | ||
@@ -2246,7 +2246,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2246 | (endpoint->bEndpointAddress) & 0x0f), | 2246 | (endpoint->bEndpointAddress) & 0x0f), |
2247 | ucs->int_in_buf, 3, read_int_callback, cs, | 2247 | ucs->int_in_buf, 3, read_int_callback, cs, |
2248 | endpoint->bInterval); | 2248 | endpoint->bInterval); |
2249 | if ((rc = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL)) != 0) { | 2249 | if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) { |
2250 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", | 2250 | dev_err(cs->dev, "could not submit interrupt URB: %s\n", |
2251 | get_usb_rcmsg(rc)); | 2251 | get_usb_rcmsg(rc)); |
2252 | goto error; | 2252 | goto error; |