ARM: tegra: Fix warnings
Scott Williams [Thu, 25 Aug 2011 21:28:10 +0000 (14:28 -0700)]
Change-Id: Ic2cecccf0f4f6e6ca612af2ee07acdbca2ce07a5
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/49281
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R59e04e0a46099403284a036de7f35d21c6188d81

arch/arm/mach-tegra/common-t3.c
arch/arm/mach-tegra/common.c

index eb3d46e..dccc715 100644 (file)
@@ -185,10 +185,11 @@ out:
        return IRQ_HANDLED;
 }
 
-static void __init tegra30_mc_init(void)
+static int __init tegra30_mc_init(void)
 {
        void __iomem *mc = IO_ADDRESS(TEGRA_MC_BASE);
        u32 reg;
+       int ret = 0;
 
        reg = 0x0A7F1010;
        writel(reg, mc + MC_RESERVED_RSV);
@@ -200,10 +201,13 @@ static void __init tegra30_mc_init(void)
        if (request_irq(INT_MC_GENERAL, tegra_mc_error_isr, 0,
                        "mc_status", NULL)) {
                pr_err("%s: unable to register MC error interrupt\n", __func__);
+               ret = -ENXIO;
        } else {
                reg = MC_INT_DECERR_EMEM | MC_INT_SECURITY_VIOLATION |
                                MC_INT_INVALID_SMMU_PAGE;
                writel(reg, mc + MC_INT_MASK);
        }
+
+       return ret;
 }
 arch_initcall(tegra30_mc_init);
index 949a262..430ea33 100644 (file)
@@ -294,8 +294,6 @@ early_param("lp0_vec", tegra_lp0_vec_arg);
 static int __init tegra_bootloader_fb_arg(char *options)
 {
        char *p = options;
-       unsigned long start;
-       unsigned long size;
 
        tegra_bootloader_fb_size = memparse(p, &p);
        if (*p == '@')