diff options
author | Pekka Enberg <penberg@kernel.org> | 2015-06-30 17:59:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 22:45:00 -0400 |
commit | f8c5b93947cd9a6bbc83ef22c060a6cfcc1572b0 (patch) | |
tree | 3955a46f459a2a9ae3ad9cc10ab3e8838082e135 | |
parent | 48a20138abeb6d28cf781ae5c3c482e9ad9f89aa (diff) |
IB/ehca: use kvfree() in ipz_queue_{cd}tor()
Use kvfree() instead of open-coding it.
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Cc: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
Cc: Christoph Raisch <raisch@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/infiniband/hw/ehca/ipz_pt_fn.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c index 8d594517cd29..7ffc748cb973 100644 --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c | |||
@@ -245,10 +245,7 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue, | |||
245 | ipz_queue_ctor_exit0: | 245 | ipz_queue_ctor_exit0: |
246 | ehca_gen_err("Couldn't alloc pages queue=%p " | 246 | ehca_gen_err("Couldn't alloc pages queue=%p " |
247 | "nr_of_pages=%x", queue, nr_of_pages); | 247 | "nr_of_pages=%x", queue, nr_of_pages); |
248 | if (is_vmalloc_addr(queue->queue_pages)) | 248 | kvfree(queue->queue_pages); |
249 | vfree(queue->queue_pages); | ||
250 | else | ||
251 | kfree(queue->queue_pages); | ||
252 | 249 | ||
253 | return 0; | 250 | return 0; |
254 | } | 251 | } |
@@ -270,10 +267,7 @@ int ipz_queue_dtor(struct ehca_pd *pd, struct ipz_queue *queue) | |||
270 | free_page((unsigned long)queue->queue_pages[i]); | 267 | free_page((unsigned long)queue->queue_pages[i]); |
271 | } | 268 | } |
272 | 269 | ||
273 | if (is_vmalloc_addr(queue->queue_pages)) | 270 | kvfree(queue->queue_pages); |
274 | vfree(queue->queue_pages); | ||
275 | else | ||
276 | kfree(queue->queue_pages); | ||
277 | 271 | ||
278 | return 1; | 272 | return 1; |
279 | } | 273 | } |