summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/latency_allowance.c
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2012-03-25 12:23:51 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2012-03-25 12:23:51 -0700
commit9a6a7aa40c77ae65575ea2e33749afe900209451 (patch)
tree1ac1a5ec591794e66aed5775c06fba6e2547eed5 /arch/arm/mach-tegra/latency_allowance.c
parentc326efe89520aa5ba148f443104b18824803a8dc (diff)
fixup: latency_allowance warnings
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/latency_allowance.c')
-rw-r--r--arch/arm/mach-tegra/latency_allowance.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/latency_allowance.c b/arch/arm/mach-tegra/latency_allowance.c
index f46ea8f90cdc..1de99705df7f 100644
--- a/arch/arm/mach-tegra/latency_allowance.c
+++ b/arch/arm/mach-tegra/latency_allowance.c
@@ -105,7 +105,7 @@ static struct dentry *latency_debug_dir;
struct la_client_info {
unsigned int fifo_size_in_atoms;
unsigned int expiration_in_ns; /* worst case expiration value */
- unsigned long reg_addr;
+ void __iomem *reg_addr;
unsigned long mask;
unsigned long shift;
enum tegra_la_id id;
@@ -226,13 +226,13 @@ struct la_scaling_info {
struct la_scaling_reg_info {
enum tegra_la_id id;
- unsigned int tl_reg_addr;
+ void __iomem *tl_reg_addr;
unsigned int tl_mask;
unsigned int tl_shift;
- unsigned int tm_reg_addr;
+ void __iomem *tm_reg_addr;
unsigned int tm_mask;
unsigned int tm_shift;
- unsigned int th_reg_addr;
+ void __iomem *th_reg_addr;
unsigned int th_mask;
unsigned int th_shift;
};
@@ -441,7 +441,7 @@ int tegra_enable_latency_scaling(enum tegra_la_id id,
unsigned int threshold_high)
{
unsigned long reg;
- unsigned long scaling_enable_reg = MC_RA(ARB_OVERRIDE);
+ void __iomem *scaling_enable_reg = MC_RA(ARB_OVERRIDE);
VALIDATE_ID(id);
VALIDATE_THRESHOLDS(threshold_low, threshold_mid, threshold_high);
@@ -476,7 +476,7 @@ exit:
void tegra_disable_latency_scaling(enum tegra_la_id id)
{
unsigned long reg;
- unsigned long scaling_enable_reg = MC_RA(ARB_OVERRIDE);
+ void __iomem *scaling_enable_reg = MC_RA(ARB_OVERRIDE);
if (id >= TEGRA_LA_MAX_ID)
return;