From: hartleys@visionengravers.com (H Hartley Sweeten)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues
Date: Tue, 9 Aug 2011 14:11:32 -0700 [thread overview]
Message-ID: <201108091411.32479.hartleys@visionengravers.com> (raw)
This fixes all the checkpatch.pl errors and warnings found in this file.
#201: ERROR: space required after that ',' (ctx:VxV)
#201: ERROR: space required after that ',' (ctx:VxV)
#250: WARNING: line over 80 characters
#281: WARNING: line over 80 characters
#361: WARNING: line over 80 characters
#435: ERROR: trailing whitespace
#438: ERROR: trailing whitespace
#449: ERROR: trailing whitespace
#451: ERROR: trailing whitespace
total: 6 errors, 3 warnings, 562 lines checked
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
---
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index ca4de71..14dba95 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -198,7 +198,7 @@ static struct clk clk_m2m1 = {
.enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M1,
};
-#define INIT_CK(dev,con,ck) \
+#define INIT_CK(dev, con, ck) \
{ .dev_id = dev, .con_id = con, .clk = ck }
static struct clk_lookup clocks[] = {
@@ -247,7 +247,8 @@ static void __clk_enable(struct clk *clk)
v = __raw_readl(clk->enable_reg);
v |= clk->enable_mask;
if (clk->sw_locked)
- ep93xx_syscon_swlocked_write(v, clk->enable_reg);
+ ep93xx_syscon_swlocked_write(v,
+ clk->enable_reg);
else
__raw_writel(v, clk->enable_reg);
}
@@ -278,7 +279,8 @@ static void __clk_disable(struct clk *clk)
v = __raw_readl(clk->enable_reg);
v &= ~clk->enable_mask;
if (clk->sw_locked)
- ep93xx_syscon_swlocked_write(v, clk->enable_reg);
+ ep93xx_syscon_swlocked_write(v,
+ clk->enable_reg);
else
__raw_writel(v, clk->enable_reg);
}
@@ -358,7 +360,7 @@ static int calc_clk_div(struct clk *clk, unsigned long rate,
int i, found = 0, __div = 0, __pdiv = 0;
/* Don't exceed the maximum rate */
- max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
+ max_rate = max3(clk_pll1.rate/4, clk_pll2.rate/4, clk_xtali.rate/4);
rate = min(rate, max_rate);
/*
@@ -432,35 +434,32 @@ static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate)
unsigned val = __raw_readl(clk->enable_reg);
if (rate == clk_i2s_mclk.rate / 2)
- ep93xx_syscon_swlocked_write(val & ~EP93XX_I2SCLKDIV_SDIV,
- clk->enable_reg);
+ val &= ~EP93XX_I2SCLKDIV_SDIV;
else if (rate == clk_i2s_mclk.rate / 4)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_SDIV,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_SDIV;
else
return -EINVAL;
+ ep93xx_syscon_swlocked_write(val, clk->enable_reg);
clk_i2s_sclk.rate = rate;
return 0;
}
static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate)
{
- unsigned val = __raw_readl(clk->enable_reg) &
+ unsigned val = __raw_readl(clk->enable_reg) &
~EP93XX_I2SCLKDIV_LRDIV_MASK;
-
+
if (rate == clk_i2s_sclk.rate / 32)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV32,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV32;
else if (rate == clk_i2s_sclk.rate / 64)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV64,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV64;
else if (rate == clk_i2s_sclk.rate / 128)
- ep93xx_syscon_swlocked_write(val | EP93XX_I2SCLKDIV_LRDIV128,
- clk->enable_reg);
+ val |= EP93XX_I2SCLKDIV_LRDIV128;
else
return -EINVAL;
+ ep93xx_syscon_swlocked_write(val, clk->enable_reg);
clk_i2s_lrclk.rate = rate;
return 0;
}
next reply other threads:[~2011-08-09 21:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-09 21:11 H Hartley Sweeten [this message]
2011-08-09 21:47 ` [PATCH] ep93xx: clock.c: fix all checkpatch.pl issues Ryan Mallon
2011-08-09 21:57 ` H Hartley Sweeten
2011-08-09 22:16 ` H Hartley Sweeten
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201108091411.32479.hartleys@visionengravers.com \
--to=hartleys@visionengravers.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.