proc: move proc_console.c to fs/proc/consoles.c

Filename is supposed to match procfile name for random junk.

Add __init while I'm at it.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index 288a49e098bff1cd49af7f2cf2e11f6dd1b6fa4b..df434c5f28fbdce6fe676dcc2a6fe8ecb9e75ec6 100644 (file)
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -10,12 +10,12 @@ proc-$(CONFIG_MMU)  := mmu.o task_mmu.o
 proc-y       += inode.o root.o base.o generic.o array.o \
                proc_tty.o
 proc-y += cmdline.o
+proc-y += consoles.o
 proc-y += cpuinfo.o
 proc-y += devices.o
 proc-y += interrupts.o
 proc-y += loadavg.o
 proc-y += meminfo.o
-proc-y += proc_console.o
 proc-y += stat.o
 proc-y += uptime.o
 proc-y += version.o

diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c
new file mode 100644 (file)
index 0000000..eafc22a
--- /dev/null
+++ b/fs/proc/consoles.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010 Werner Fink, Jiri Slaby
+ *
+ * Licensed under GPLv2
+ */
+
+#include <linux/console.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/tty_driver.h>
+
+/*
+ * This is handler for /proc/consoles
+ */
+static int show_console_dev(struct seq_file *m, void *v)
+{
+       static const struct {
+               short flag;
+               char name;
+       } con_flags[] = {
+               { CON_ENABLED,          'E' },
+               { CON_CONSDEV,          'C' },
+               { CON_BOOT,             'B' },
+               { CON_PRINTBUFFER,      'p' },
+               { CON_BRL,              'b' },
+               { CON_ANYTIME,          'a' },
+       };
+       char flags[ARRAY_SIZE(con_flags) + 1];
+       struct console *con = v;
+       unsigned int a;
+       int len;
+       dev_t dev = 0;
+
+       if (con->device) {
+               const struct tty_driver *driver;
+               int index;
+               driver = con->device(con, &index);
+               if (driver) {
+                       dev = MKDEV(driver->major, driver->minor_start);
+                       dev += index;
+               }
+       }
+
+       for (a = 0; a < ARRAY_SIZE(con_flags); a++)
+               flags[a] = (con->flags & con_flags[a].flag) ?
+                       con_flags[a].name : ' ';
+       flags[a] = 0;
+
+       seq_printf(m, "%s%d%n", con->name, con->index, &len);
+       len = 21 - len;
+       if (len < 1)
+               len = 1;
+       seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
+                       con->write ? 'W' : '-', con->unblank ? 'U' : '-',
+                       flags);
+       if (dev)
+               seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
+
+       seq_printf(m, "\n");
+
+       return 0;
+}
+
+static void *c_start(struct seq_file *m, loff_t *pos)
+{
+       struct console *con;
+       loff_t off = 0;
+
+       acquire_console_sem();
+       for_each_console(con)
+               if (off++ == *pos)
+                       break;
+
+       return con;
+}
+
+static void *c_next(struct seq_file *m, void *v, loff_t *pos)
+{
+       struct console *con = v;
+       ++*pos;
+       return con->next;
+}
+
+static void c_stop(struct seq_file *m, void *v)
+{
+       release_console_sem();
+}
+
+static const struct seq_operations consoles_op = {
+       .start  = c_start,
+       .next   = c_next,
+       .stop   = c_stop,
+       .show   = show_console_dev
+};
+
+static int consoles_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &consoles_op);
+}
+
+static const struct file_operations proc_consoles_operations = {
+       .open           = consoles_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
+
+static int __init proc_consoles_init(void)
+{
+       proc_create("consoles", 0, NULL, &proc_consoles_operations);
+       return 0;
+}
+module_init(proc_consoles_init);

diff --git a/fs/proc/proc_console.c b/fs/proc/proc_console.c
deleted file mode 100644 (file)
index 8a70760..0000000
--- a/fs/proc/proc_console.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2010 Werner Fink, Jiri Slaby
- *
- * Licensed under GPLv2
- */
-
-#include <linux/console.h>
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/tty_driver.h>
-
-/*
- * This is handler for /proc/consoles
- */
-static int show_console_dev(struct seq_file *m, void *v)
-{
-       static const struct {
-               short flag;
-               char name;
-       } con_flags[] = {
-               { CON_ENABLED,          'E' },
-               { CON_CONSDEV,          'C' },
-               { CON_BOOT,             'B' },
-               { CON_PRINTBUFFER,      'p' },
-               { CON_BRL,              'b' },
-               { CON_ANYTIME,          'a' },
-       };
-       char flags[ARRAY_SIZE(con_flags) + 1];
-       struct console *con = v;
-       unsigned int a;
-       int len;
-       dev_t dev = 0;
-
-       if (con->device) {
-               const struct tty_driver *driver;
-               int index;
-               driver = con->device(con, &index);
-               if (driver) {
-                       dev = MKDEV(driver->major, driver->minor_start);
-                       dev += index;
-               }
-       }
-
-       for (a = 0; a < ARRAY_SIZE(con_flags); a++)
-               flags[a] = (con->flags & con_flags[a].flag) ?
-                       con_flags[a].name : ' ';
-       flags[a] = 0;
-
-       seq_printf(m, "%s%d%n", con->name, con->index, &len);
-       len = 21 - len;
-       if (len < 1)
-               len = 1;
-       seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
-                       con->write ? 'W' : '-', con->unblank ? 'U' : '-',
-                       flags);
-       if (dev)
-               seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
-
-       seq_printf(m, "\n");
-
-       return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-       struct console *con;
-       loff_t off = 0;
-
-       acquire_console_sem();
-       for_each_console(con)
-               if (off++ == *pos)
-                       break;
-
-       return con;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-       struct console *con = v;
-       ++*pos;
-       return con->next;
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-       release_console_sem();
-}
-
-static const struct seq_operations consoles_op = {
-       .start  = c_start,
-       .next   = c_next,
-       .stop   = c_stop,
-       .show   = show_console_dev
-};
-
-static int consoles_open(struct inode *inode, struct file *file)
-{
-       return seq_open(file, &consoles_op);
-}
-
-static const struct file_operations proc_consoles_operations = {
-       .open           = consoles_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
-};
-
-static int register_proc_consoles(void)
-{
-       proc_create("consoles", 0, NULL, &proc_consoles_operations);
-       return 0;
-}
-module_init(register_proc_consoles);