ARM: tegra: Fix sizeATaddr display order in error message.
Also move a local variable into a closed block.
Original-Change-Id: Ifca24c640c917d3a86c27da526c482ec0b6abeb2
Reviewed-on: http://git-master/r/27241
Tested-by: Hiro Sugawara <hsugawara@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Original-Change-Id: I24c57262a0e6f2b32c11e4786cc5a56b9ffe866b
Rebase-Id: R8f93d4507562402fd3394276d9745738706141f3
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index d907cb9..962a3d7 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -341,7 +341,6 @@
#ifdef SUPPORT_TEGRA_3_IOVMM_SMMU_A01
extern struct platform_device tegra_smmu_device;
int smmu_reserved = 0;
- size_t smmu_window_size;
struct resource *smmu_window =
platform_get_resource_byname(&tegra_smmu_device,
IORESOURCE_MEM, "smmu");
@@ -404,6 +403,8 @@
if (!smmu_window) {
pr_err("No SMMU resources\n");
} else {
+ size_t smmu_window_size;
+
if (tegra_get_revision() == TEGRA_REVISION_A01) {
smmu_window->start = TEGRA_SMMU_BASE_A01;
smmu_window->end = TEGRA_SMMU_BASE_A01 +
@@ -415,8 +416,8 @@
smmu_window_size))
pr_err(
"Failed to reserve SMMU I/O VA window %08lx@%08lx\n",
- (unsigned long)smmu_window->start,
- (unsigned long)smmu_window_size);
+ (unsigned long)smmu_window_size,
+ (unsigned long)smmu_window->start);
else
smmu_reserved = 1;
}