summaryrefslogtreecommitdiff
path: root/drivers/memory
diff options
context:
space:
mode:
authorHiroshi DOYU <hdoyu@nvidia.com>2012-05-11 13:04:44 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-11 15:21:27 -0700
commit0c733a427c430b54a6fa574fbc6e96baf7b9202f (patch)
tree43971ffa5c7c2f0fce6f1e45c9e820807494b8a4 /drivers/memory
parentf8450fca6ecdea38b5a882fdf6cd097e3ec8651c (diff)
downloadlinux-3.10-0c733a427c430b54a6fa574fbc6e96baf7b9202f.tar.gz
linux-3.10-0c733a427c430b54a6fa574fbc6e96baf7b9202f.tar.bz2
linux-3.10-0c733a427c430b54a6fa574fbc6e96baf7b9202f.zip
ARM: tegra20: MC: Remove unnecessary BUG*()
Accessing interleaved MC register offsets/ranges are verified. BUG*()s in accessors can be removed. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/tegra20-mc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c
index c0bfffacdc6..2a437e92756 100644
--- a/drivers/memory/tegra20-mc.c
+++ b/drivers/memory/tegra20-mc.c
@@ -53,12 +53,14 @@ struct tegra20_mc {
static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
{
+ u32 val = 0;
+
if (offs < 0x24)
- return readl(mc->regs[0] + offs);
- BUG_ON(offs < 0x3c);
+ val = readl(mc->regs[0] + offs);
if (offs < 0x400)
- return readl(mc->regs[1] + offs - 0x3c);
- BUG();
+ val = readl(mc->regs[1] + offs - 0x3c);
+
+ return val;
}
static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
@@ -67,12 +69,10 @@ static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
writel(val, mc->regs[0] + offs);
return;
}
- BUG_ON(offs < 0x3c);
if (offs < 0x400) {
writel(val, mc->regs[1] + offs - 0x3c);
return;
}
- BUG();
}
static const char * const tegra20_mc_client[] = {