Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index d6d835a08de685a33bb0e95e1b038ac2e4e4621c..2f17d66d0e617e31b9b8dfb76899b2a0dbc5f8aa 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Block device elevator/IO-scheduler.
  *
@@ -177,7 +178,7 @@ static void elevator_release(struct kobject *kobj)
        kfree(e);
 }
 
-void elevator_exit(struct request_queue *q, struct elevator_queue *e)
+void __elevator_exit(struct request_queue *q, struct elevator_queue *e)
 {
        mutex_lock(&e->sysfs_lock);
        if (e->type->ops.exit_sched)
@@ -509,8 +510,6 @@ void elv_unregister_queue(struct request_queue *q)
 
 int elv_register(struct elevator_type *e)
 {
-       char *def = "";
-
        /* create icq_cache if requested */
        if (e->icq_size) {
                if (WARN_ON(e->icq_size < sizeof(struct io_cq)) ||
@@ -535,8 +534,8 @@ int elv_register(struct elevator_type *e)
        list_add_tail(&e->list, &elv_list);
        spin_unlock(&elv_list_lock);
 
-       printk(KERN_INFO "io scheduler %s registered%s\n", e->elevator_name,
-                                                               def);
+       printk(KERN_INFO "io scheduler %s registered\n", e->elevator_name);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(elv_register);