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/input/yealink.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/input/yealink.c')
-rw-r--r-- | drivers/usb/input/yealink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c index 2268ca311ade..caff8e6d7448 100644 --- a/drivers/usb/input/yealink.c +++ b/drivers/usb/input/yealink.c | |||
@@ -874,17 +874,17 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
874 | 874 | ||
875 | /* allocate usb buffers */ | 875 | /* allocate usb buffers */ |
876 | yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 876 | yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, |
877 | SLAB_ATOMIC, &yld->irq_dma); | 877 | GFP_ATOMIC, &yld->irq_dma); |
878 | if (yld->irq_data == NULL) | 878 | if (yld->irq_data == NULL) |
879 | return usb_cleanup(yld, -ENOMEM); | 879 | return usb_cleanup(yld, -ENOMEM); |
880 | 880 | ||
881 | yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 881 | yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, |
882 | SLAB_ATOMIC, &yld->ctl_dma); | 882 | GFP_ATOMIC, &yld->ctl_dma); |
883 | if (!yld->ctl_data) | 883 | if (!yld->ctl_data) |
884 | return usb_cleanup(yld, -ENOMEM); | 884 | return usb_cleanup(yld, -ENOMEM); |
885 | 885 | ||
886 | yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)), | 886 | yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)), |
887 | SLAB_ATOMIC, &yld->ctl_req_dma); | 887 | GFP_ATOMIC, &yld->ctl_req_dma); |
888 | if (yld->ctl_req == NULL) | 888 | if (yld->ctl_req == NULL) |
889 | return usb_cleanup(yld, -ENOMEM); | 889 | return usb_cleanup(yld, -ENOMEM); |
890 | 890 | ||