This fix some code style issues like braces in the incorrect position, assignments in a if condition and lack of a space before '&&'
Signed-off-by: Chihau Chau <chihau@xxxxxxxxx>
---
arch/arm/mach-msm/acpuclock-arm11.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index 7ffbd98..d716cf1 100644
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -51,8 +51,7 @@
#define PERF_SWITCH_DEBUG 0
#define PERF_SWITCH_STEP_DEBUG 0
-struct clock_state
-{
+struct clock_state {
struct clkctl_acpu_speed *current_speed;
struct mutex lock;
uint32_t acpu_switch_time_us;
@@ -88,7 +87,7 @@ struct clkctl_acpu_speed {
unsigned int ahbclk_khz;
unsigned int ahbclk_div;
int vdd;
- unsigned int axiclk_khz;
+ unsigned int axiclk_khz;
unsigned long lpj; /* loops_per_jiffy */
/* Index in acpu_freq_tbl[] for steppings. */
short down;
@@ -176,7 +175,8 @@ static int pc_pll_request(unsigned id, unsigned on)
* ARM11 'owned' clock control
*---------------------------------------------------------------------------*/
-unsigned long acpuclk_power_collapse(void) {
+unsigned long acpuclk_power_collapse(void)
+{
int ret = acpuclk_get_rate();
ret *= 1000;
if (ret > drv_state.power_collapse_khz)
@@ -189,7 +189,8 @@ unsigned long acpuclk_get_wfi_rate(void)
return drv_state.wait_for_irq_khz;
}
-unsigned long acpuclk_wait_for_irq(void) {
+unsigned long acpuclk_wait_for_irq(void)
+{
int ret = acpuclk_get_rate();
ret *= 1000;
if (ret > drv_state.wait_for_irq_khz)
@@ -223,7 +224,8 @@ static int acpuclk_set_vdd_level(int vdd)
}
/* Set proper dividers for the given clock speed. */
-static void acpuclk_set_div(const struct clkctl_acpu_speed *hunt_s) {
+static void acpuclk_set_div(const struct clkctl_acpu_speed *hunt_s)
+{
uint32_t reg_clkctl, reg_clksel, clk_div;
/* AHB_CLK_DIV */
@@ -336,7 +338,8 @@ int acpuclk_set_rate(unsigned long rate, int for_power_collapse)
}
/* Increase VDD if needed. */
if (tgt_s->vdd > cur_s->vdd) {
- if ((rc = acpuclk_set_vdd_level(tgt_s->vdd)) < 0) {
+ rc = acpuclk_set_vdd_level(tgt_s->vdd)
+ if (rc < 0) {
printk(KERN_ERR "Unable to switch ACPU vdd\n");
goto out;
}
@@ -378,7 +381,7 @@ int acpuclk_set_rate(unsigned long rate, int for_power_collapse)
printk(KERN_DEBUG "%s: STEP khz = %u, pll = %d\n",
__FUNCTION__, cur_s->a11clk_khz, cur_s->pll);
#endif
- if (!for_power_collapse&& cur_s->pll != ACPU_PLL_TCXO
+ if (!for_power_collapse && cur_s->pll != ACPU_PLL_TCXO
&& !(plls_enabled & (1 << cur_s->pll))) {
rc = pc_pll_request(cur_s->pll, 1);
if (rc < 0) {
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
