diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/isdn/gigaset/usb-gigaset.c | |
parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) |
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
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 5ebf49ac9b23..af89ce188f2a 100644 --- a/drivers/isdn/gigaset/usb-gigaset.c +++ b/drivers/isdn/gigaset/usb-gigaset.c | |||
@@ -410,7 +410,7 @@ static void gigaset_read_int_callback(struct urb *urb) | |||
410 | 410 | ||
411 | if (resubmit) { | 411 | if (resubmit) { |
412 | spin_lock_irqsave(&cs->lock, flags); | 412 | spin_lock_irqsave(&cs->lock, flags); |
413 | r = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV; | 413 | r = cs->connected ? usb_submit_urb(urb, GFP_ATOMIC) : -ENODEV; |
414 | spin_unlock_irqrestore(&cs->lock, flags); | 414 | spin_unlock_irqrestore(&cs->lock, flags); |
415 | if (r) | 415 | if (r) |
416 | dev_err(cs->dev, "error %d when resubmitting urb.\n", | 416 | dev_err(cs->dev, "error %d when resubmitting urb.\n", |
@@ -486,7 +486,7 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb) | |||
486 | atomic_set(&ucs->busy, 1); | 486 | atomic_set(&ucs->busy, 1); |
487 | 487 | ||
488 | spin_lock_irqsave(&cs->lock, flags); | 488 | spin_lock_irqsave(&cs->lock, flags); |
489 | status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC) : -ENODEV; | 489 | status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC) : -ENODEV; |
490 | spin_unlock_irqrestore(&cs->lock, flags); | 490 | spin_unlock_irqrestore(&cs->lock, flags); |
491 | 491 | ||
492 | if (status) { | 492 | if (status) { |
@@ -664,7 +664,7 @@ static int write_modem(struct cardstate *cs) | |||
664 | ucs->bulk_out_endpointAddr & 0x0f), | 664 | ucs->bulk_out_endpointAddr & 0x0f), |
665 | ucs->bulk_out_buffer, count, | 665 | ucs->bulk_out_buffer, count, |
666 | gigaset_write_bulk_callback, cs); | 666 | gigaset_write_bulk_callback, cs); |
667 | ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC); | 667 | ret = usb_submit_urb(ucs->bulk_out_urb, GFP_ATOMIC); |
668 | } else { | 668 | } else { |
669 | ret = -ENODEV; | 669 | ret = -ENODEV; |
670 | } | 670 | } |