Merge tag 'trace-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / edac / armada_xp_edac.c

diff --git a/drivers/edac/armada_xp_edac.c b/drivers/edac/armada_xp_edac.c
index a7502eb..e3e7575 100644 (file)
--- a/drivers/edac/armada_xp_edac.c
+++ b/drivers/edac/armada_xp_edac.c
@@ -78,7 +78,7 @@ struct axp_mc_drvdata {
        char msg[128];
 };
 
-/* derived from "DRAM Address Multiplexing" in the ARAMDA XP Functional Spec */
+/* derived from "DRAM Address Multiplexing" in the ARMADA XP Functional Spec */
 static uint32_t axp_mc_calc_address(struct axp_mc_drvdata *drvdata,
                                    uint8_t cs, uint8_t bank, uint16_t row,
                                    uint16_t col)
@@ -160,12 +160,12 @@ static void axp_mc_check(struct mem_ctl_info *mci)
                if (cnt_sbe)
                        cnt_sbe--;
                else
-                       dev_warn(mci->pdev, "inconsistent SBE count detected");
+                       dev_warn(mci->pdev, "inconsistent SBE count detected\n");
        } else {
                if (cnt_dbe)
                        cnt_dbe--;
                else
-                       dev_warn(mci->pdev, "inconsistent DBE count detected");
+                       dev_warn(mci->pdev, "inconsistent DBE count detected\n");
        }
 
        /* report earlier errors */
@@ -304,7 +304,7 @@ static int axp_mc_probe(struct platform_device *pdev)
 
        config = readl(base + SDRAM_CONFIG_REG);
        if (!(config & SDRAM_CONFIG_ECC_MASK)) {
-               dev_warn(&pdev->dev, "SDRAM ECC is not enabled");
+               dev_warn(&pdev->dev, "SDRAM ECC is not enabled\n");
                return -EINVAL;
        }
 
@@ -532,9 +532,9 @@ static int aurora_l2_probe(struct platform_device *pdev)
 
        l2x0_aux_ctrl = readl(base + L2X0_AUX_CTRL);
        if (!(l2x0_aux_ctrl & AURORA_ACR_PARITY_EN))
-               dev_warn(&pdev->dev, "tag parity is not enabled");
+               dev_warn(&pdev->dev, "tag parity is not enabled\n");
        if (!(l2x0_aux_ctrl & AURORA_ACR_ECC_EN))
-               dev_warn(&pdev->dev, "data ECC is not enabled");
+               dev_warn(&pdev->dev, "data ECC is not enabled\n");
 
        dci = edac_device_alloc_ctl_info(sizeof(*drvdata),
                                         "cpu", 1, "L", 1, 2, NULL, 0, 0);
@@ -618,7 +618,7 @@ static int __init armada_xp_edac_init(void)
 
        res = platform_register_drivers(drivers, ARRAY_SIZE(drivers));
        if (res)
-               pr_warn("Aramda XP EDAC drivers fail to register\n");
+               pr_warn("Armada XP EDAC drivers fail to register\n");
 
        return 0;
 }