diff options
| author | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-05-11 06:04:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-11 18:21:27 -0400 |
| commit | 0c733a427c430b54a6fa574fbc6e96baf7b9202f (patch) | |
| tree | 43971ffa5c7c2f0fce6f1e45c9e820807494b8a4 /drivers/memory | |
| parent | f8450fca6ecdea38b5a882fdf6cd097e3ec8651c (diff) | |
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.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c index c0bfffacdc64..2a437e92756c 100644 --- a/drivers/memory/tegra20-mc.c +++ b/drivers/memory/tegra20-mc.c | |||
| @@ -53,12 +53,14 @@ struct tegra20_mc { | |||
| 53 | 53 | ||
| 54 | static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs) | 54 | static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs) |
| 55 | { | 55 | { |
| 56 | u32 val = 0; | ||
| 57 | |||
| 56 | if (offs < 0x24) | 58 | if (offs < 0x24) |
| 57 | return readl(mc->regs[0] + offs); | 59 | val = readl(mc->regs[0] + offs); |
| 58 | BUG_ON(offs < 0x3c); | ||
| 59 | if (offs < 0x400) | 60 | if (offs < 0x400) |
| 60 | return readl(mc->regs[1] + offs - 0x3c); | 61 | val = readl(mc->regs[1] + offs - 0x3c); |
| 61 | BUG(); | 62 | |
| 63 | return val; | ||
| 62 | } | 64 | } |
| 63 | 65 | ||
| 64 | static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs) | 66 | 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) | |||
| 67 | writel(val, mc->regs[0] + offs); | 69 | writel(val, mc->regs[0] + offs); |
| 68 | return; | 70 | return; |
| 69 | } | 71 | } |
| 70 | BUG_ON(offs < 0x3c); | ||
| 71 | if (offs < 0x400) { | 72 | if (offs < 0x400) { |
| 72 | writel(val, mc->regs[1] + offs - 0x3c); | 73 | writel(val, mc->regs[1] + offs - 0x3c); |
| 73 | return; | 74 | return; |
| 74 | } | 75 | } |
| 75 | BUG(); | ||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | static const char * const tegra20_mc_client[] = { | 78 | static const char * const tegra20_mc_client[] = { |
