diff options
| -rw-r--r-- | arch/arm/mach-tegra/common-t3.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/iovmm.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/common-t3.c b/arch/arm/mach-tegra/common-t3.c index c4c7752d1f42..17a26c202c9b 100644 --- a/arch/arm/mach-tegra/common-t3.c +++ b/arch/arm/mach-tegra/common-t3.c @@ -185,10 +185,11 @@ out: return IRQ_HANDLED; } -void __init tegra_mc_init(void) +int __init tegra_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 @@ void __init tegra_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(tegra_mc_init); diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 1f8856a38340..e67a65faa1e7 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -336,8 +336,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 == '@') diff --git a/arch/arm/mach-tegra/iovmm.c b/arch/arm/mach-tegra/iovmm.c index dfe02fc17b7c..1e91d8071678 100644 --- a/arch/arm/mach-tegra/iovmm.c +++ b/arch/arm/mach-tegra/iovmm.c @@ -101,10 +101,10 @@ size_t tegra_iovmm_get_max_free(struct tegra_iovmm_client *client) struct rb_node *n; struct tegra_iovmm_block *b; struct tegra_iovmm_domain *domain = client->domain; + tegra_iovmm_addr_t max_free = 0; spin_lock(&domain->block_lock); n = rb_first(&domain->all_blocks); - tegra_iovmm_addr_t max_free = 0; while (n) { b = rb_entry(n, struct tegra_iovmm_block, all_node); n = rb_next(n); @@ -902,7 +902,7 @@ static int tegra_iovmm_suspend(void) } } spin_unlock_irqrestore(&iovmm_device_list_lock, flags); - return 0; + return 0; } static void tegra_iovmm_resume(void) |