5 files changed, 6 insertions, 5 deletions

diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
index bba0cdfd83bc..5d0983d47161 100644
--- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c
@@ -26,7 +26,7 @@ void ralink_clk_add(const char *dev, unsigned long rate)
         struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL);
 
         if (!clk)
-                panic("failed to add clock\n");
+                panic("failed to add clock");
 
         clk->cl.dev_id = dev;
         clk->cl.clk = clk;
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index d217509e5300..a3ad56c2372d 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -350,7 +350,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
                 name = "MT7620A";
                 soc_info->compatible = "ralink,mt7620a-soc";
         } else {
-                panic("mt7620: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
+                panic("mt7620: unknown SoC, n0:%08x n1:%08x", n0, n1);
         }
 
         rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index ce38d11f9da5..eccc5526155e 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -21,6 +21,7 @@
 #include <asm/reboot.h>
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
+#include <asm/prom.h>
 
 #include "common.h"
 
@@ -108,7 +109,7 @@ static int __init plat_of_setup(void)
         strncpy(of_ids[1].compatible, "palmbus", len);
 
         if (of_platform_populate(NULL, of_ids, NULL, NULL))
-                panic("failed to populate DT\n");
+                panic("failed to populate DT");
 
         /* make sure ithat the reset controller is setup early */
         ralink_rst_init();
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index ca7ee3a33790..bb82a82da9e7 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -276,7 +276,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
                 name = "RT5350";
                 soc_info->compatible = "ralink,rt5350-soc";
         } else {
-                panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
+                panic("rt305x: unknown SoC, n0:%08x n1:%08x", n0, n1);
         }
 
         id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
index e49241a2c39a..202785709441 100644
--- a/arch/mips/ralink/timer.c
+++ b/arch/mips/ralink/timer.c
@@ -126,7 +126,7 @@ static int rt_timer_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        rt->membase = devm_request_and_ioremap(&pdev->dev, res);
+        rt->membase = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(rt->membase))
                 return PTR_ERR(rt->membase);