Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

[cascardo/linux.git] / net / wimax / stack.c

diff --git a/net/wimax/stack.c b/net/wimax/stack.c
index ec8b577..3f816e2 100644 (file)
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
@@ -191,8 +191,8 @@ void __check_new_state(enum wimax_st old_state, enum wimax_st new_state,
                       unsigned int allowed_states_bm)
 {
        if (WARN_ON(((1 << new_state) & allowed_states_bm) == 0)) {
-               printk(KERN_ERR "SW BUG! Forbidden state change %u -> %u\n",
-                       old_state, new_state);
+               pr_err("SW BUG! Forbidden state change %u -> %u\n",
+                      old_state, new_state);
        }
 }
 
@@ -602,8 +602,7 @@ int __init wimax_subsys_init(void)
                                                      wimax_gnl_ops,
                                                      wimax_gnl_mcgrps);
        if (unlikely(result < 0)) {
-               printk(KERN_ERR "cannot register generic netlink family: %d\n",
-                      result);
+               pr_err("cannot register generic netlink family: %d\n", result);
                goto error_register_family;
        }