* [PATCH RFT] memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
@ 2012-09-20 1:32 Axel Lin
2012-09-20 18:28 ` Stephen Warren
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2012-09-20 1:32 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Hiroshi DOYU, Stephen Warren, linux-kernel
The code reading the register does not match the code writing to the register,
fix it.
Also fix the coding style in mc_writel() for better readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/memory/tegra20-mc.c | 10 +++-------
drivers/memory/tegra30-mc.c | 22 +++++++---------------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c
index 3ed49c1..e6764bb 100644
--- a/drivers/memory/tegra20-mc.c
+++ b/drivers/memory/tegra20-mc.c
@@ -57,7 +57,7 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
if (offs < 0x24)
val = readl(mc->regs[0] + offs);
- if (offs < 0x400)
+ else if (offs < 0x400)
val = readl(mc->regs[1] + offs - 0x3c);
return val;
@@ -65,14 +65,10 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
{
- if (offs < 0x24) {
+ if (offs < 0x24)
writel(val, mc->regs[0] + offs);
- return;
- }
- if (offs < 0x400) {
+ else if (offs < 0x400)
writel(val, mc->regs[1] + offs - 0x3c);
- return;
- }
}
static const char * const tegra20_mc_client[] = {
diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index e56ff04..802b9ea 100644
--- a/drivers/memory/tegra30-mc.c
+++ b/drivers/memory/tegra30-mc.c
@@ -95,11 +95,11 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
if (offs < 0x10)
val = readl(mc->regs[0] + offs);
- if (offs < 0x1f0)
+ else if (offs < 0x1f0)
val = readl(mc->regs[1] + offs - 0x3c);
- if (offs < 0x228)
+ else if (offs < 0x228)
val = readl(mc->regs[2] + offs - 0x200);
- if (offs < 0x400)
+ else if (offs < 0x400)
val = readl(mc->regs[3] + offs - 0x284);
return val;
@@ -107,22 +107,14 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
static inline void mc_writel(struct tegra30_mc *mc, u32 val, u32 offs)
{
- if (offs < 0x10) {
+ if (offs < 0x10)
writel(val, mc->regs[0] + offs);
- return;
- }
- if (offs < 0x1f0) {
+ else if (offs < 0x1f0)
writel(val, mc->regs[1] + offs - 0x3c);
- return;
- }
- if (offs < 0x228) {
+ else if (offs < 0x228)
writel(val, mc->regs[2] + offs - 0x200);
- return;
- }
- if (offs < 0x400) {
+ else if (offs < 0x400)
writel(val, mc->regs[3] + offs - 0x284);
- return;
- }
}
static const char * const tegra30_mc_client[] = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH RFT] memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-20 1:32 [PATCH RFT] memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl() Axel Lin
@ 2012-09-20 18:28 ` Stephen Warren
2012-09-20 22:12 ` Axel Lin
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2012-09-20 18:28 UTC (permalink / raw)
To: Axel Lin; +Cc: Greg Kroah-Hartman, Hiroshi DOYU, linux-kernel
On 09/19/2012 07:32 PM, Axel Lin wrote:
> The code reading the register does not match the code writing to the register,
> fix it.
>
> Also fix the coding style in mc_writel() for better readability.
I assume RFT==Request For Test? I haven't seen that before. Anyway,
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RFT] memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-20 18:28 ` Stephen Warren
@ 2012-09-20 22:12 ` Axel Lin
0 siblings, 0 replies; 3+ messages in thread
From: Axel Lin @ 2012-09-20 22:12 UTC (permalink / raw)
To: Stephen Warren; +Cc: Greg Kroah-Hartman, Hiroshi DOYU, linux-kernel
2012/9/21 Stephen Warren <swarren@wwwdotorg.org>:
> On 09/19/2012 07:32 PM, Axel Lin wrote:
>> The code reading the register does not match the code writing to the register,
>> fix it.
>>
>> Also fix the coding style in mc_writel() for better readability.
>
> I assume RFT==Request For Test? I haven't seen that before. Anyway,
Yes, it means "Request For Test" because I don't have a tegra platform handy.
>
> Acked-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
Thanks for the review and testing.
Axel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-20 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-20 1:32 [PATCH RFT] memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl() Axel Lin
2012-09-20 18:28 ` Stephen Warren
2012-09-20 22:12 ` Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).