Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / pci / pci-tx4938.c

diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c
index 141bba562488d1d37fef412804952c34dff45dd9..000c0e1f9ef869d884d8c9a0cbb286ba87bae97b 100644 (file)
--- a/arch/mips/pci/pci-tx4938.c
+++ b/arch/mips/pci/pci-tx4938.c
@@ -21,9 +21,9 @@ int __init tx4938_report_pciclk(void)
 {
        int pciclk = 0;
 
-       printk(KERN_INFO "PCIC --%s PCICLK:",
-              (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66) ?
-              " PCI66" : "");
+       pr_info("PCIC --%s PCICLK:",
+               (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66) ?
+               " PCI66" : "");
        if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
                u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
                switch ((unsigned long)ccfg &
@@ -45,14 +45,14 @@ int __init tx4938_report_pciclk(void)
                case TX4938_CCFG_PCIDIVMODE_11:
                        pciclk = txx9_cpu_clock / 11; break;
                }
-               printk("Internal(%u.%uMHz)",
-                      (pciclk + 50000) / 1000000,
-                      ((pciclk + 50000) / 100000) % 10);
+               pr_cont("Internal(%u.%uMHz)",
+                       (pciclk + 50000) / 1000000,
+                       ((pciclk + 50000) / 100000) % 10);
        } else {
-               printk("External");
+               pr_cont("External");
                pciclk = -1;
        }
-       printk("\n");
+       pr_cont("\n");
        return pciclk;
 }
 
@@ -62,10 +62,10 @@ void __init tx4938_report_pci1clk(void)
        unsigned int pciclk =
                txx9_gbus_clock / ((ccfg & TX4938_CCFG_PCI1DMD) ? 4 : 2);
 
-       printk(KERN_INFO "PCIC1 -- %sPCICLK:%u.%uMHz\n",
-              (ccfg & TX4938_CCFG_PCI1_66) ? "PCI66 " : "",
-              (pciclk + 50000) / 1000000,
-              ((pciclk + 50000) / 100000) % 10);
+       pr_info("PCIC1 -- %sPCICLK:%u.%uMHz\n",
+               (ccfg & TX4938_CCFG_PCI1_66) ? "PCI66 " : "",
+               (pciclk + 50000) / 1000000,
+               ((pciclk + 50000) / 100000) % 10);
 }
 
 int __init tx4938_pciclk66_setup(void)
@@ -105,8 +105,8 @@ int __init tx4938_pciclk66_setup(void)
                }
                tx4938_ccfg_change(TX4938_CCFG_PCIDIVMODE_MASK,
                                   pcidivmode);
-               printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",
-                      (unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg));
+               pr_debug("PCICLK: ccfg:%08lx\n",
+                        (unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg));
        } else
                pciclk = -1;
        return pciclk;
@@ -138,5 +138,5 @@ void __init tx4938_setup_pcierr_irq(void)
                        tx4927_pcierr_interrupt,
                        0, "PCI error",
                        (void *)TX4927_PCIC_REG))
-               printk(KERN_WARNING "Failed to request irq for PCIERR\n");
+               pr_warn("Failed to request irq for PCIERR\n");
 }