jenna
/
kernel_samsung_sm7125
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clk: tegra: Miscellaneous coding style cleanups

Browse Source 
Use unsigned int for loop variables that can never become negative and
remove a couple of gratuitous blank lines. Also use single spaces around
operators and use a single space instead of a tab to separate comments
from code.

Signed-off-by: Thierry Reding <treding@nvidia.com>
tirimbino
Thierry Reding 9 years ago
parent c4947e364b
commit e52d7c04bb
5 changed files with 19 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      drivers/clk/tegra/clk-pll.c
  2. 12
      drivers/clk/tegra/clk-tegra114.c
  3. 6
      drivers/clk/tegra/clk-tegra124.c
  4. 5
      drivers/clk/tegra/clk-tegra20.c
  5. 15
      drivers/clk/tegra/clk-tegra30.c

6
drivers/clk/tegra/clk-pll.c
Unescape View File

@ -439,7 +439,7 @@ static int _calc_rate(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg,
/* /*
* PLL_P_OUT1 rate is not listed in PLLA table * PLL_P_OUT1 rate is not listed in PLLA table
*/ */
cfreq = parent_rate/(parent_rate/1000000); cfreq = parent_rate / (parent_rate / 1000000);
break; break;
default: default:
pr_err("%s Unexpected reference rate %lu\n", pr_err("%s Unexpected reference rate %lu\n",
@ -936,8 +936,8 @@ static int _calc_dynamic_ramp_rate(struct clk_hw *hw,
p_div = _p_div_to_hw(hw, p); p_div = _p_div_to_hw(hw, p);
if (p_div < 0) if (p_div < 0)
return p_div; return p_div;
else
cfg->p = p_div; cfg->p = p_div;
if (cfg->n > divn_max(pll) || cfg->output_rate > pll->params->vco_max) if (cfg->n > divn_max(pll) || cfg->output_rate > pll->params->vco_max)
return -EINVAL; return -EINVAL;

12
drivers/clk/tegra/clk-tegra114.c
Unescape View File

@ -215,7 +215,7 @@ static struct tegra_clk_pll_params pll_c_params = {
.input_min = 12000000, .input_min = 12000000,
.input_max = 800000000, .input_max = 800000000,
.cf_min = 12000000, .cf_min = 12000000,
.cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */ .cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */
.vco_min = 600000000, .vco_min = 600000000,
.vco_max = 1400000000, .vco_max = 1400000000,
.base_reg = PLLC_BASE, .base_reg = PLLC_BASE,
@ -337,7 +337,7 @@ static struct tegra_clk_pll_params pll_m_params = {
.input_min = 12000000, .input_min = 12000000,
.input_max = 500000000, .input_max = 500000000,
.cf_min = 12000000, .cf_min = 12000000,
.cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */ .cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */
.vco_min = 400000000, .vco_min = 400000000,
.vco_max = 1066000000, .vco_max = 1066000000,
.base_reg = PLLM_BASE, .base_reg = PLLM_BASE,
@ -534,7 +534,7 @@ static struct tegra_clk_pll_params pll_x_params = {
.input_min = 12000000, .input_min = 12000000,
.input_max = 800000000, .input_max = 800000000,
.cf_min = 12000000, .cf_min = 12000000,
.cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */ .cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */
.vco_min = 700000000, .vco_min = 700000000,
.vco_max = 2400000000U, .vco_max = 2400000000U,
.base_reg = PLLX_BASE, .base_reg = PLLX_BASE,
@ -965,8 +965,8 @@ static void __init tegra114_fixed_clk_init(void __iomem *clk_base)
static __init void tegra114_utmi_param_configure(void __iomem *clk_base) static __init void tegra114_utmi_param_configure(void __iomem *clk_base)
{ {
unsigned int i;
u32 reg; u32 reg;
int i;
for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) { for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) {
if (osc_freq == utmi_parameters[i].osc_frequency) if (osc_freq == utmi_parameters[i].osc_frequency)
@ -1173,7 +1173,7 @@ static __init void tegra114_periph_clk_init(void __iomem *clk_base,
{ {
struct clk *clk; struct clk *clk;
struct tegra_periph_init_data *data; struct tegra_periph_init_data *data;
int i; unsigned int i;
/* xusb_ss_div2 */ /* xusb_ss_div2 */
clk = clk_register_fixed_factor(NULL, "xusb_ss_div2", "xusb_ss_src", 0, clk = clk_register_fixed_factor(NULL, "xusb_ss_div2", "xusb_ss_src", 0,
@ -1278,7 +1278,7 @@ static struct tegra_cpu_car_ops tegra114_cpu_car_ops = {
static const struct of_device_id pmc_match[] __initconst = { static const struct of_device_id pmc_match[] __initconst = {
{ .compatible = "nvidia,tegra114-pmc" }, { .compatible = "nvidia,tegra114-pmc" },
{}, { },
}; };
/* /*

6
drivers/clk/tegra/clk-tegra124.c
Unescape View File

@ -235,7 +235,7 @@ static struct tegra_clk_pll_params pll_c_params = {
.input_min = 12000000, .input_min = 12000000,
.input_max = 800000000, .input_max = 800000000,
.cf_min = 12000000, .cf_min = 12000000,
.cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */ .cf_max = 19200000, /* s/w policy, h/w capability 50 MHz */
.vco_min = 600000000, .vco_min = 600000000,
.vco_max = 1400000000, .vco_max = 1400000000,
.base_reg = PLLC_BASE, .base_reg = PLLC_BASE,
@ -1024,8 +1024,8 @@ static struct clk **clks;
static void tegra124_utmi_param_configure(void __iomem *clk_base) static void tegra124_utmi_param_configure(void __iomem *clk_base)
{ {
unsigned int i;
u32 reg; u32 reg;
int i;
for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) { for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) {
if (osc_freq == utmi_parameters[i].osc_frequency) if (osc_freq == utmi_parameters[i].osc_frequency)
@ -1356,7 +1356,7 @@ static struct tegra_cpu_car_ops tegra124_cpu_car_ops = {
static const struct of_device_id pmc_match[] __initconst = { static const struct of_device_id pmc_match[] __initconst = {
{ .compatible = "nvidia,tegra124-pmc" }, { .compatible = "nvidia,tegra124-pmc" },
{}, { },
}; };
static struct tegra_clk_init_table common_init_table[] __initdata = { static struct tegra_clk_init_table common_init_table[] __initdata = {

5
drivers/clk/tegra/clk-tegra20.c
Unescape View File

@ -759,7 +759,6 @@ static void __init tegra20_audio_clk_init(void)
CLK_SET_RATE_PARENT, 89, CLK_SET_RATE_PARENT, 89,
periph_clk_enb_refcnt); periph_clk_enb_refcnt);
clks[TEGRA20_CLK_AUDIO_2X] = clk; clks[TEGRA20_CLK_AUDIO_2X] = clk;
} }
static const char *i2s1_parents[] = {"pll_a_out0", "audio_2x", "pll_p", static const char *i2s1_parents[] = {"pll_a_out0", "audio_2x", "pll_p",
@ -802,7 +801,7 @@ static void __init tegra20_periph_clk_init(void)
{ {
struct tegra_periph_init_data *data; struct tegra_periph_init_data *data;
struct clk *clk; struct clk *clk;
int i; unsigned int i;
/* ac97 */ /* ac97 */
clk = tegra_clk_register_periph_gate("ac97", "pll_a_out0", clk = tegra_clk_register_periph_gate("ac97", "pll_a_out0",
@ -1085,7 +1084,7 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = {
static const struct of_device_id pmc_match[] __initconst = { static const struct of_device_id pmc_match[] __initconst = {
{ .compatible = "nvidia,tegra20-pmc" }, { .compatible = "nvidia,tegra20-pmc" },
{}, { },
}; };
static void __init tegra20_clock_init(struct device_node *np) static void __init tegra20_clock_init(struct device_node *np)

15
drivers/clk/tegra/clk-tegra30.c
Unescape View File

@ -505,7 +505,6 @@ static struct tegra_clk_pll_params pll_d_params = {
.freq_table = pll_d_freq_table, .freq_table = pll_d_freq_table,
.flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON |
TEGRA_PLL_USE_LOCK, TEGRA_PLL_USE_LOCK,
}; };
static struct tegra_clk_pll_params pll_d2_params = { static struct tegra_clk_pll_params pll_d2_params = {
@ -861,13 +860,12 @@ static struct tegra_clk tegra30_clks[tegra_clk_max] __initdata = {
[tegra_clk_pll_p_out4] = { .dt_id = TEGRA30_CLK_PLL_P_OUT4, .present = true }, [tegra_clk_pll_p_out4] = { .dt_id = TEGRA30_CLK_PLL_P_OUT4, .present = true },
[tegra_clk_pll_a] = { .dt_id = TEGRA30_CLK_PLL_A, .present = true }, [tegra_clk_pll_a] = { .dt_id = TEGRA30_CLK_PLL_A, .present = true },
[tegra_clk_pll_a_out0] = { .dt_id = TEGRA30_CLK_PLL_A_OUT0, .present = true }, [tegra_clk_pll_a_out0] = { .dt_id = TEGRA30_CLK_PLL_A_OUT0, .present = true },
}; };
static void tegra30_utmi_param_configure(void) static void tegra30_utmi_param_configure(void)
{ {
unsigned int i;
u32 reg; u32 reg;
int i;
for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) { for (i = 0; i < ARRAY_SIZE(utmi_parameters); i++) {
if (input_freq == utmi_parameters[i].osc_frequency) if (input_freq == utmi_parameters[i].osc_frequency)
@ -925,7 +923,7 @@ static void __init tegra30_pll_init(void)
/* PLLC */ /* PLLC */
clk = tegra_clk_register_pll("pll_c", "pll_ref", clk_base, pmc_base, 0, clk = tegra_clk_register_pll("pll_c", "pll_ref", clk_base, pmc_base, 0,
&pll_c_params, NULL); &pll_c_params, NULL);
clks[TEGRA30_CLK_PLL_C] = clk; clks[TEGRA30_CLK_PLL_C] = clk;
/* PLLC_OUT1 */ /* PLLC_OUT1 */
@ -1135,7 +1133,7 @@ static void __init tegra30_periph_clk_init(void)
{ {
struct tegra_periph_init_data *data; struct tegra_periph_init_data *data;
struct clk *clk; struct clk *clk;
int i; unsigned int i;
/* dsia */ /* dsia */
clk = tegra_clk_register_periph_gate("dsia", "pll_d_out0", 0, clk_base, clk = tegra_clk_register_periph_gate("dsia", "pll_d_out0", 0, clk_base,
@ -1224,7 +1222,6 @@ static void tegra30_cpu_out_of_reset(u32 cpu)
wmb(); wmb();
} }
static void tegra30_enable_cpu_clock(u32 cpu) static void tegra30_enable_cpu_clock(u32 cpu)
{ {
unsigned int reg; unsigned int reg;
@ -1237,7 +1234,6 @@ static void tegra30_enable_cpu_clock(u32 cpu)
static void tegra30_disable_cpu_clock(u32 cpu) static void tegra30_disable_cpu_clock(u32 cpu)
{ {
unsigned int reg; unsigned int reg;
reg = readl(clk_base + TEGRA_CLK_RST_CONTROLLER_CLK_CPU_CMPLX); reg = readl(clk_base + TEGRA_CLK_RST_CONTROLLER_CLK_CPU_CMPLX);
@ -1268,7 +1264,7 @@ static void tegra30_cpu_clock_suspend(void)
/* switch coresite to clk_m, save off original source */ /* switch coresite to clk_m, save off original source */
tegra30_cpu_clk_sctx.clk_csite_src = tegra30_cpu_clk_sctx.clk_csite_src =
readl(clk_base + CLK_RESET_SOURCE_CSITE); readl(clk_base + CLK_RESET_SOURCE_CSITE);
writel(3<<30, clk_base + CLK_RESET_SOURCE_CSITE); writel(3 << 30, clk_base + CLK_RESET_SOURCE_CSITE);
tegra30_cpu_clk_sctx.cpu_burst = tegra30_cpu_clk_sctx.cpu_burst =
readl(clk_base + CLK_RESET_CCLK_BURST); readl(clk_base + CLK_RESET_CCLK_BURST);
@ -1402,7 +1398,7 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = {
static const struct of_device_id pmc_match[] __initconst = { static const struct of_device_id pmc_match[] __initconst = {
{ .compatible = "nvidia,tegra30-pmc" }, { .compatible = "nvidia,tegra30-pmc" },
{}, { },
}; };
static struct tegra_audio_clk_info tegra30_audio_plls[] = { static struct tegra_audio_clk_info tegra30_audio_plls[] = {
@ -1441,7 +1437,6 @@ static void __init tegra30_clock_init(struct device_node *np)
NULL) < 0) NULL) < 0)
return; return;
tegra_fixed_clk_init(tegra30_clks); tegra_fixed_clk_init(tegra30_clks);
tegra30_pll_init(); tegra30_pll_init();
tegra30_super_clk_init(); tegra30_super_clk_init();

Write Preview
Loading…
Cancel
Save