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/usb/storage/onetouch.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/usb/storage/onetouch.c')
-rw-r--r-- | drivers/usb/storage/onetouch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 3a158d58441f..e565d3d2ab29 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c | |||
@@ -76,7 +76,7 @@ static void usb_onetouch_irq(struct urb *urb) | |||
76 | input_sync(dev); | 76 | input_sync(dev); |
77 | 77 | ||
78 | resubmit: | 78 | resubmit: |
79 | status = usb_submit_urb (urb, SLAB_ATOMIC); | 79 | status = usb_submit_urb (urb, GFP_ATOMIC); |
80 | if (status) | 80 | if (status) |
81 | err ("can't resubmit intr, %s-%s/input0, status %d", | 81 | err ("can't resubmit intr, %s-%s/input0, status %d", |
82 | onetouch->udev->bus->bus_name, | 82 | onetouch->udev->bus->bus_name, |
@@ -154,7 +154,7 @@ int onetouch_connect_input(struct us_data *ss) | |||
154 | goto fail1; | 154 | goto fail1; |
155 | 155 | ||
156 | onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, | 156 | onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, |
157 | SLAB_ATOMIC, &onetouch->data_dma); | 157 | GFP_ATOMIC, &onetouch->data_dma); |
158 | if (!onetouch->data) | 158 | if (!onetouch->data) |
159 | goto fail1; | 159 | goto fail1; |
160 | 160 | ||