cleanup console_print()

console_print() is an old legacy interface mostly unused in the entire
kernel tree. It's best to clean up its existing use and let developers
use their own implementation of it as they feel fit.

Signed-off-by: Anirban Sinha <asinha@zeugmasystems.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 23f846de62d58ae6e60a9c445911419daa4ff17f..e6c5c3d5e1f8ef79fb623bc82b656e11c2c6c938 100644 (file)
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -34,6 +34,7 @@
 #include <asm/mca_asm.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
+#include "head.h"
 
 #ifdef CONFIG_HOTPLUG_CPU
 #define SAL_PSR_BITS_TO_SET                            \

diff --git a/arch/ia64/kernel/head.h b/arch/ia64/kernel/head.h
new file mode 100644 (file)
index 0000000..2e2ac68
--- /dev/null
+++ b/arch/ia64/kernel/head.h
@@ -0,0 +1 @@
+extern void console_print(const char *s);

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 89969e9500456e3a17212b6f20ea47d6abbc6fb3..9bcec9945c1256417efa2829f6334922aaa7a5aa 100644 (file)
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -161,6 +161,13 @@ show_regs (struct pt_regs *regs)
                show_stack(NULL, NULL);
 }
 
+/* local support for deprecated console_print */
+void
+console_print(const char *s)
+{
+       printk(KERN_EMERG "%s", s);
+}
+
 void
 do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
 {

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 51e7a46787bea72aa23e93535e4d9ce636b63448..5942a9d674c0051885bd796fc005b39f14622657 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -171,7 +171,6 @@ static int startup(struct cyclades_port *);
 static void cy_throttle(struct tty_struct *);
 static void cy_unthrottle(struct tty_struct *);
 static void config_setup(struct cyclades_port *);
-extern void console_print(const char *);
 #ifdef CYCLOM_SHOW_STATUS
 static void show_status(int);
 #endif
@@ -245,7 +244,7 @@ void SP(char *data)
 {
        unsigned long flags;
        local_irq_save(flags);
-       console_print(data);
+       printk(KERN_EMERG "%s", data);
        local_irq_restore(flags);
 }
 
@@ -255,7 +254,7 @@ void CP(char data)
        unsigned long flags;
        local_irq_save(flags);
        scrn[0] = data;
-       console_print(scrn);
+       printk(KERN_EMERG "%c", scrn);
        local_irq_restore(flags);
 }                              /* CP */
 

diff --git a/include/linux/dtlk.h b/include/linux/dtlk.h
index 2896d90118a9cebda7c78f0e5f0941b4aa580d23..22a7b9a5f5d1b5bb77718f87dc7d62f42b59c313 100644 (file)
--- a/include/linux/dtlk.h
+++ b/include/linux/dtlk.h
@@ -1,22 +1,3 @@
-#if 0
-
-#define TRACE_TXT(text) \
-       { \
-         if(dtlk_trace) \
-         { \
-           console_print(text); \
-           console_print("\n"); \
-         } \
-       }
-
-#define TRACE_CHR(chr) \
-       { \
-         if(dtlk_trace) \
-           console_print(chr); \
-       } \
-
-#endif
-
 #define DTLK_MINOR     0
 #define DTLK_IO_EXTENT 0x02
 

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 0d3974f59c53e2dcfec0f7d1ae8f36dfc5ea210a..a916a318004e316d32272cc46228522852751529 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -519,10 +519,6 @@ extern void serial_console_init(void);
 
 extern int pcxe_open(struct tty_struct *tty, struct file *filp);
 
-/* printk.c */
-
-extern void console_print(const char *);
-
 /* vt.c */
 
 extern int vt_ioctl(struct tty_struct *tty, struct file *file,

diff --git a/kernel/printk.c b/kernel/printk.c
index e10d193a833a4c0076d5616c2ee2ba61bb7dbce1..602033acd6c76e1f7ba06de0f053ff4ea4c28f77 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1075,12 +1075,6 @@ void __sched console_conditional_schedule(void)
 }
 EXPORT_SYMBOL(console_conditional_schedule);
 
-void console_print(const char *s)
-{
-       printk(KERN_EMERG "%s", s);
-}
-EXPORT_SYMBOL(console_print);
-
 void console_unblank(void)
 {
        struct console *c;