Merge tag 'mac80211-for-davem-2014-12-18' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / arch / arm / mm / cache-tauros2.c

diff --git a/arch/arm/mm/cache-tauros2.c b/arch/arm/mm/cache-tauros2.c
index b273739..1e373d2 100644 (file)
--- a/arch/arm/mm/cache-tauros2.c
+++ b/arch/arm/mm/cache-tauros2.c
@@ -185,7 +185,7 @@ static void enable_extra_feature(unsigned int features)
                u &= ~0x01000000;
        else
                u |= 0x01000000;
-       printk(KERN_INFO "Tauros2: %s L2 prefetch.\n",
+       pr_info("Tauros2: %s L2 prefetch.\n",
                        (features & CACHE_TAUROS2_PREFETCH_ON)
                        ? "Enabling" : "Disabling");
 
@@ -193,7 +193,7 @@ static void enable_extra_feature(unsigned int features)
                u |= 0x00100000;
        else
                u &= ~0x00100000;
-       printk(KERN_INFO "Tauros2: %s line fill burt8.\n",
+       pr_info("Tauros2: %s line fill burt8.\n",
                        (features & CACHE_TAUROS2_LINEFILL_BURST8)
                        ? "Enabling" : "Disabling");
 
@@ -216,7 +216,7 @@ static void __init tauros2_internal_init(unsigned int features)
                 */
                feat = read_extra_features();
                if (!(feat & 0x00400000)) {
-                       printk(KERN_INFO "Tauros2: Enabling L2 cache.\n");
+                       pr_info("Tauros2: Enabling L2 cache.\n");
                        write_extra_features(feat | 0x00400000);
                }
 
@@ -253,7 +253,7 @@ static void __init tauros2_internal_init(unsigned int features)
                 */
                actlr = read_actlr();
                if (!(actlr & 0x00000002)) {
-                       printk(KERN_INFO "Tauros2: Enabling L2 cache.\n");
+                       pr_info("Tauros2: Enabling L2 cache.\n");
                        write_actlr(actlr | 0x00000002);
                }
 
@@ -262,11 +262,11 @@ static void __init tauros2_internal_init(unsigned int features)
 #endif
 
        if (mode == NULL) {
-               printk(KERN_CRIT "Tauros2: Unable to detect CPU mode.\n");
+               pr_crit("Tauros2: Unable to detect CPU mode.\n");
                return;
        }
 
-       printk(KERN_INFO "Tauros2: L2 cache support initialised "
+       pr_info("Tauros2: L2 cache support initialised "
                         "in %s mode.\n", mode);
 }