From fa335388d936a56935aaa101d73a799da9271c11 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Jul 2012 17:46:17 -0700 Subject: [PATCH] staging: csr: oska: remove print.h and print.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No one was calling these functions, so remove them. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/oska/Makefile | 1 - drivers/staging/csr/oska/print.c | 44 --------------------------------------- drivers/staging/csr/oska/print.h | 32 ---------------------------- 3 files changed, 77 deletions(-) delete mode 100644 drivers/staging/csr/oska/print.c delete mode 100644 drivers/staging/csr/oska/print.h diff --git a/drivers/staging/csr/oska/Makefile b/drivers/staging/csr/oska/Makefile index 92d3f86..63ab141 100644 --- a/drivers/staging/csr/oska/Makefile +++ b/drivers/staging/csr/oska/Makefile @@ -3,7 +3,6 @@ obj-$(CONFIG_CSR_WIFI) := csr_oska.o csr_oska-y := \ event.o \ oska_module.o \ - print.o \ thread.o \ timer.o diff --git a/drivers/staging/csr/oska/print.c b/drivers/staging/csr/oska/print.c deleted file mode 100644 index 5f5b263..0000000 --- a/drivers/staging/csr/oska/print.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Linux console printing functions. - * - * Copyright (C) 2007 Cambridge Silicon Radio Ltd. - * - * Refer to LICENSE.txt included with this source code for details on - * the license terms. - */ -#include - -#include "print.h" - -void os_print(enum os_print_level level, const char *prefix, const char *name, - const char *format, ...) -{ - va_list va_args; - - va_start(va_args, format); - os_vprint(level, prefix, name, format, va_args); - va_end(va_args); -} -EXPORT_SYMBOL(os_print); - -void os_vprint(enum os_print_level level, const char *prefix, const char *name, - const char *format, va_list args) -{ - const char *level_str[] = { - [OS_PRINT_ERROR] = KERN_ERR, - [OS_PRINT_WARNING] = KERN_WARNING, - [OS_PRINT_INFO] = KERN_INFO, - [OS_PRINT_DEBUG] = KERN_DEBUG, - }; - char buf[80]; - int w = 0; - - if (name) { - w += snprintf(buf + w, sizeof(buf) - w, "%s%s%s: ", level_str[level], prefix, name); - } else { - w += snprintf(buf + w, sizeof(buf) - w, "%s%s", level_str[level], prefix); - } - w += vsnprintf(buf + w, sizeof(buf) - w, format, args); - printk("%s\n", buf); -} -EXPORT_SYMBOL(os_vprint); diff --git a/drivers/staging/csr/oska/print.h b/drivers/staging/csr/oska/print.h deleted file mode 100644 index f48bb83..0000000 --- a/drivers/staging/csr/oska/print.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * OSKA Linux implementation -- console printing - * - * Copyright (C) 2007 Cambridge Silicon Radio Ltd. - * - * Refer to LICENSE.txt included with this source code for details on - * the license terms. - */ -#ifndef __OSKA_LINUX_PRINT_H -#define __OSKA_LINUX_PRINT_H - -#include - -/** - * Severity of a console or log message. - * - * @ingroup print - */ -enum os_print_level { - OS_PRINT_ERROR, - OS_PRINT_WARNING, - OS_PRINT_INFO, - OS_PRINT_DEBUG, -}; - -void os_print(enum os_print_level level, const char *prefix, const char *name, - const char *format, ...); -void os_vprint(enum os_print_level level, const char *prefix, const char *name, - const char *format, va_list args); - - -#endif /* #ifndef __OSKA_LINUX_PRINT_H */ -- 2.7.4