Skip to content

Commit

Permalink
ARM: tegra20: MC: Remove unnecessary BUG*()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hiroshi DOYU authored and Greg Kroah-Hartman committed May 11, 2012
1 parent f8450fc commit 0c733a4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/memory/tegra20-mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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[] = {
Expand Down

0 comments on commit 0c733a4

Please sign in to comment.