From 86ecacb99348156fd4a1e0ee23424da7db5f04bb Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Mon, 14 May 2012 13:07:03 +0300 Subject: [PATCH] --- yaml --- r: 304109 b: refs/heads/master c: 90394482b807cb0a474fb387ed020603df14cfd0 h: refs/heads/master i: 304107: 09026cf919431e1c0cf623faeed024d472ff64a8 v: v3 --- [refs] | 2 +- trunk/drivers/memory/tegra20-mc.c | 5 +++-- trunk/drivers/memory/tegra30-mc.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5cbcb1df78b3..45881a923333 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ca045930338485a8cdef117e74372aa1678009d +refs/heads/master: 90394482b807cb0a474fb387ed020603df14cfd0 diff --git a/trunk/drivers/memory/tegra20-mc.c b/trunk/drivers/memory/tegra20-mc.c index 2a437e92756c..a38d9d3de231 100644 --- a/trunk/drivers/memory/tegra20-mc.c +++ b/trunk/drivers/memory/tegra20-mc.c @@ -161,7 +161,8 @@ static void tegra20_mc_decode(struct tegra20_mc *mc, int n) idx = n - MC_INT_ERR_SHIFT; if ((idx < 0) || (idx >= ARRAY_SIZE(reg))) { - pr_err_ratelimited("Unknown interrupt status %08lx\n", BIT(n)); + dev_err_ratelimited(mc->dev, "Unknown interrupt status %08lx\n", + BIT(n)); return; } @@ -172,7 +173,7 @@ static void tegra20_mc_decode(struct tegra20_mc *mc, int n) addr = mc_readl(mc, reg[idx].offset + sizeof(u32)); - pr_err_ratelimited("%s (0x%08x): 0x%08x %s (%s %s)\n", + dev_err_ratelimited(mc->dev, "%s (0x%08x): 0x%08x %s (%s %s)\n", reg[idx].message, req, addr, client, (req & BIT(reg[idx].write_bit)) ? "write" : "read", (reg[idx].offset == MC_SECURITY_VIOLATION_STATUS) ? diff --git a/trunk/drivers/memory/tegra30-mc.c b/trunk/drivers/memory/tegra30-mc.c index ec9fc7894801..cb639b1cd5e9 100644 --- a/trunk/drivers/memory/tegra30-mc.c +++ b/trunk/drivers/memory/tegra30-mc.c @@ -220,7 +220,8 @@ static void tegra30_mc_decode(struct tegra30_mc *mc, int n) idx = n - MC_INT_ERR_SHIFT; if ((idx < 0) || (idx >= ARRAY_SIZE(mc_int_err)) || (idx == 1)) { - pr_err_ratelimited("Unknown interrupt status %08lx\n", BIT(n)); + dev_err_ratelimited(mc->dev, "Unknown interrupt status %08lx\n", + BIT(n)); return; } @@ -243,7 +244,7 @@ static void tegra30_mc_decode(struct tegra30_mc *mc, int n) addr = readl(mc + MC_ERR_ADR); - pr_err_ratelimited("%s (0x%08x): 0x%08x %s (%s %s %s %s)\n", + dev_err_ratelimited(mc->dev, "%s (0x%08x): 0x%08x %s (%s %s %s %s)\n", mc_int_err[idx], err, addr, client, (err & MC_ERR_SECURITY) ? "secure" : "non-secure", (err & MC_ERR_RW) ? "write" : "read",