Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / amso1100 / c2_vq.c

diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index 36620a22413cd1f5f40e99e9f5ee138ad4a0ad85..9ce7819b7b2e5f2988d0a22fcd085cf77f5c3cad 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -85,7 +85,7 @@ int vq_init(struct c2_dev *c2dev)
                (char) ('0' + c2dev->devnum));
        c2dev->host_msg_cache =
            kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0,
-                             SLAB_HWCACHE_ALIGN, NULL, NULL);
+                             SLAB_HWCACHE_ALIGN, NULL);
        if (c2dev->host_msg_cache == NULL) {
                return -ENOMEM;
        }
@@ -197,7 +197,7 @@ int vq_send_wr(struct c2_dev *c2dev, union c2wr *wr)
         */
        while (msg == NULL) {
                pr_debug("%s:%d no available msg in VQ, waiting...\n",
-                      __FUNCTION__, __LINE__);
+                      __func__, __LINE__);
                init_waitqueue_entry(&__wait, current);
                add_wait_queue(&c2dev->req_vq_wo, &__wait);
                spin_unlock(&c2dev->vqlock);