diff options
Diffstat (limited to 'drivers/ieee1394/raw1394.c')
-rw-r--r-- | drivers/ieee1394/raw1394.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 47f6a4e29b40..bf71e069eaf5 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c | |||
@@ -112,7 +112,7 @@ static struct pending_request *__alloc_pending_request(gfp_t flags) | |||
112 | 112 | ||
113 | static inline struct pending_request *alloc_pending_request(void) | 113 | static inline struct pending_request *alloc_pending_request(void) |
114 | { | 114 | { |
115 | return __alloc_pending_request(SLAB_KERNEL); | 115 | return __alloc_pending_request(GFP_KERNEL); |
116 | } | 116 | } |
117 | 117 | ||
118 | static void free_pending_request(struct pending_request *req) | 118 | static void free_pending_request(struct pending_request *req) |
@@ -1737,7 +1737,7 @@ static int arm_register(struct file_info *fi, struct pending_request *req) | |||
1737 | return (-EINVAL); | 1737 | return (-EINVAL); |
1738 | } | 1738 | } |
1739 | /* addr-list-entry for fileinfo */ | 1739 | /* addr-list-entry for fileinfo */ |
1740 | addr = kmalloc(sizeof(*addr), SLAB_KERNEL); | 1740 | addr = kmalloc(sizeof(*addr), GFP_KERNEL); |
1741 | if (!addr) { | 1741 | if (!addr) { |
1742 | req->req.length = 0; | 1742 | req->req.length = 0; |
1743 | return (-ENOMEM); | 1743 | return (-ENOMEM); |
@@ -2103,7 +2103,7 @@ static int write_phypacket(struct file_info *fi, struct pending_request *req) | |||
2103 | static int get_config_rom(struct file_info *fi, struct pending_request *req) | 2103 | static int get_config_rom(struct file_info *fi, struct pending_request *req) |
2104 | { | 2104 | { |
2105 | int ret = sizeof(struct raw1394_request); | 2105 | int ret = sizeof(struct raw1394_request); |
2106 | quadlet_t *data = kmalloc(req->req.length, SLAB_KERNEL); | 2106 | quadlet_t *data = kmalloc(req->req.length, GFP_KERNEL); |
2107 | int status; | 2107 | int status; |
2108 | 2108 | ||
2109 | if (!data) | 2109 | if (!data) |
@@ -2133,7 +2133,7 @@ static int get_config_rom(struct file_info *fi, struct pending_request *req) | |||
2133 | static int update_config_rom(struct file_info *fi, struct pending_request *req) | 2133 | static int update_config_rom(struct file_info *fi, struct pending_request *req) |
2134 | { | 2134 | { |
2135 | int ret = sizeof(struct raw1394_request); | 2135 | int ret = sizeof(struct raw1394_request); |
2136 | quadlet_t *data = kmalloc(req->req.length, SLAB_KERNEL); | 2136 | quadlet_t *data = kmalloc(req->req.length, GFP_KERNEL); |
2137 | if (!data) | 2137 | if (!data) |
2138 | return -ENOMEM; | 2138 | return -ENOMEM; |
2139 | if (copy_from_user(data, int2ptr(req->req.sendb), req->req.length)) { | 2139 | if (copy_from_user(data, int2ptr(req->req.sendb), req->req.length)) { |
@@ -2779,7 +2779,7 @@ static int raw1394_open(struct inode *inode, struct file *file) | |||
2779 | { | 2779 | { |
2780 | struct file_info *fi; | 2780 | struct file_info *fi; |
2781 | 2781 | ||
2782 | fi = kzalloc(sizeof(*fi), SLAB_KERNEL); | 2782 | fi = kzalloc(sizeof(*fi), GFP_KERNEL); |
2783 | if (!fi) | 2783 | if (!fi) |
2784 | return -ENOMEM; | 2784 | return -ENOMEM; |
2785 | 2785 | ||