Merge remote-tracking branch 'wireless/master' into mac80211

1 files changed, 5 insertions, 13 deletions

diff --git a/net/tipc/core.c b/net/tipc/core.c
index f7b95239ebda..6586eac6a50e 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -34,22 +34,18 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/module.h>
-
 #include "core.h"
 #include "ref.h"
 #include "name_table.h"
 #include "subscr.h"
 #include "config.h"
 
+#include <linux/module.h>
 
 #ifndef CONFIG_TIPC_PORTS
 #define CONFIG_TIPC_PORTS 8191
 #endif
 
-#ifndef CONFIG_TIPC_LOG
-#define CONFIG_TIPC_LOG 0
-#endif
 
 /* global variables used by multiple sub-systems within TIPC */
 int tipc_random;
@@ -125,7 +121,6 @@ static void tipc_core_stop(void)
         tipc_nametbl_stop();
         tipc_ref_table_stop();
         tipc_socket_stop();
-        tipc_log_resize(0);
 }
 
 /**
@@ -161,10 +156,7 @@ static int __init tipc_init(void)
 {
         int res;
 
-        if (tipc_log_resize(CONFIG_TIPC_LOG) != 0)
-                warn("Unable to create log buffer\n");
-
-        info("Activated (version " TIPC_MOD_VER ")\n");
+        pr_info("Activated (version " TIPC_MOD_VER ")\n");
 
         tipc_own_addr = 0;
         tipc_remote_management = 1;
@@ -175,9 +167,9 @@ static int __init tipc_init(void)
 
         res = tipc_core_start();
         if (res)
-                err("Unable to start in single node mode\n");
+                pr_err("Unable to start in single node mode\n");
         else
-                info("Started in single node mode\n");
+                pr_info("Started in single node mode\n");
         return res;
 }
 
@@ -185,7 +177,7 @@ static void __exit tipc_exit(void)
 {
         tipc_core_stop_net();
         tipc_core_stop();
-        info("Deactivated\n");
+        pr_info("Deactivated\n");
 }
 
 module_init(tipc_init);