Clean up some lingering artifacts from the rebase

5 files changed, 10 insertions, 12 deletions

diff --git a/litmus/ctrldev.c b/litmus/ctrldev.c
index 27415d5baaf8..b649a27f5041 100644
--- a/litmus/ctrldev.c
+++ b/litmus/ctrldev.c
@@ -141,7 +141,7 @@ static long litmus_ctrl_ioctl(struct file *filp,
 
         /* LITMUS^RT syscall emulation: we expose LITMUS^RT-specific operations
          * via ioctl() to avoid merge conflicts with the syscall tables when
-         * rebasing LITMUS^RT. Whi this is not the most elegant way to expose
+         * rebasing LITMUS^RT. While this is not the most elegant way to expose
          * syscall-like functionality, it helps with reducing the effort
          * required to maintain LITMUS^RT out of tree.
          */
@@ -184,9 +184,10 @@ static long litmus_ctrl_ioctl(struct file *filp,
                                 syscall_args.od_open.obj_type,
                                 syscall_args.od_open.obj_id,
                                 syscall_args.od_open.config);
+                default:
+                        printk(KERN_DEBUG "ctrldev: strange od_open cmd: %d\n", cmd);
+                        return -EINVAL;
                 }
-                printk(KERN_DEBUG "Weird litmus od_open cmd: %d\n", cmd);
-                return -EINVAL;
 
 
         case LRT_null_call:
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 8329d14e8714..790440604c7d 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -636,8 +636,6 @@ int litmus_be_migrate_to(int cpu)
 }
 
 #ifdef CONFIG_MAGIC_SYSRQ
-int send_sig(int sig, struct task_struct *p, int priv);
-
 static void sysrq_handle_kill_rt_tasks(int key)
 {
         struct task_struct *t;
diff --git a/litmus/locking.c b/litmus/locking.c
index bf8c676a1330..183d4ac68fe7 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -151,7 +151,7 @@ unsigned int __add_wait_queue_prio_exclusive(
         /* find a spot where the new entry is less than the next */
         list_for_each(pos, &head->head) {
                 prio_wait_queue_t* queued = list_entry(pos, prio_wait_queue_t,
-                        wq.entry);
+                                                       wq.entry);
 
                 if (unlikely(lt_before(new->priority, queued->priority) ||
                              (new->priority == queued->priority &&
diff --git a/litmus/sched_trace.c b/litmus/sched_trace.c
index 1fb84ac5f629..4f60de8e976f 100644
--- a/litmus/sched_trace.c
+++ b/litmus/sched_trace.c
@@ -10,9 +10,8 @@
 #include <asm/uaccess.h>
 #include <linux/module.h>
 #include <linux/sysrq.h>
-#include <linux/sched.h>
-#include <linux/kfifo.h>
 #include <linux/sched/signal.h>
+#include <linux/kfifo.h>
 
 atomic_t __log_seq_no = ATOMIC_INIT(0);
 
diff --git a/litmus/srp.c b/litmus/srp.c
index 9fe7a001e907..eedc236b6473 100644
--- a/litmus/srp.c
+++ b/litmus/srp.c
@@ -276,10 +276,10 @@ static int srp_wake_up(wait_queue_entry_t *wait, unsigned mode, int sync,
 
 static void do_ceiling_block(struct task_struct *tsk)
 {
-        struct wait_queue_entry wait = {
-                .private   = tsk,
-                .func      = srp_wake_up,
-                .entry = {NULL, NULL}
+        wait_queue_entry_t wait = {
+                .private = tsk,
+                .func    = srp_wake_up,
+                .entry   = {NULL, NULL}
         };
 
         tsk->state = TASK_UNINTERRUPTIBLE;