Pull ec into release branch

[platform/adaptation/renesas_rcar/renesas_kernel.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 8e5fcf2..f2992e7 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1043,7 +1043,7 @@ static int __init bsg_init(void)
        dev_t devid;
 
        bsg_cmd_cachep = kmem_cache_create("bsg_cmd",
-                               sizeof(struct bsg_command), 0, 0, NULL, NULL);
+                               sizeof(struct bsg_command), 0, 0, NULL);
        if (!bsg_cmd_cachep) {
                printk(KERN_ERR "bsg: failed creating slab cache\n");
                return -ENOMEM;
@@ -1073,7 +1073,7 @@ static int __init bsg_init(void)
        if (ret)
                goto remove_cdev;
 
-       printk(KERN_INFO BSG_DESCRIPTION "version " BSG_VERSION
+       printk(KERN_INFO BSG_DESCRIPTION " version " BSG_VERSION
               " loaded (major %d)\n", bsg_major);
        return 0;
 remove_cdev: