diff options
author | Olof Johansson <olof@lixom.net> | 2011-09-08 21:02:50 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-10-13 17:08:26 -0400 |
commit | 45fba2186256988a8f0cc2d7f8de6ef53fb1e4ba (patch) | |
tree | 339b7fcb7d3453b06cf3da868e7aceec766e92f8 /arch/arm/mach-tegra | |
parent | d395935f55a7ceebf22c752bbfbfe1272648a08b (diff) |
ARM: tegra: tegra2_clocks: 0 -> NULL changes
Fixes a lot of:
arch/arm/mach-tegra/tegra2_clocks.c:921:34: warning: Using plain integer as NULL pointer
arch/arm/mach-tegra/tegra2_clocks.c:1462:4: warning: Using plain integer as NULL pointer
arch/arm/mach-tegra/tegra2_clocks.c:1864:4: warning: Using plain integer as NULL pointer
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 3325cd6b7f28..6dd5133e56d3 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c | |||
@@ -918,7 +918,7 @@ static struct clk_ops tegra_pll_div_ops = { | |||
918 | static void tegra2_periph_clk_init(struct clk *c) | 918 | static void tegra2_periph_clk_init(struct clk *c) |
919 | { | 919 | { |
920 | u32 val = clk_readl(c->reg); | 920 | u32 val = clk_readl(c->reg); |
921 | const struct clk_mux_sel *mux = 0; | 921 | const struct clk_mux_sel *mux = NULL; |
922 | const struct clk_mux_sel *sel; | 922 | const struct clk_mux_sel *sel; |
923 | if (c->flags & MUX) { | 923 | if (c->flags & MUX) { |
924 | for (sel = c->inputs; sel->input != NULL; sel++) { | 924 | for (sel = c->inputs; sel->input != NULL; sel++) { |
@@ -1459,7 +1459,7 @@ static struct clk tegra_pll_s = { | |||
1459 | static struct clk_mux_sel tegra_clk_m_sel[] = { | 1459 | static struct clk_mux_sel tegra_clk_m_sel[] = { |
1460 | { .input = &tegra_clk_32k, .value = 0}, | 1460 | { .input = &tegra_clk_32k, .value = 0}, |
1461 | { .input = &tegra_pll_s, .value = 1}, | 1461 | { .input = &tegra_pll_s, .value = 1}, |
1462 | { 0, 0}, | 1462 | { NULL , 0}, |
1463 | }; | 1463 | }; |
1464 | 1464 | ||
1465 | static struct clk tegra_clk_m = { | 1465 | static struct clk tegra_clk_m = { |
@@ -1861,7 +1861,7 @@ static const struct audio_sources { | |||
1861 | { .name = "ext_audio_clk1", .value = 6 }, | 1861 | { .name = "ext_audio_clk1", .value = 6 }, |
1862 | { .name = "ext_vimclk", .value = 7 }, | 1862 | { .name = "ext_vimclk", .value = 7 }, |
1863 | #endif | 1863 | #endif |
1864 | { 0, 0 } | 1864 | { NULL, 0 } |
1865 | }; | 1865 | }; |
1866 | 1866 | ||
1867 | static struct clk tegra_clk_audio = { | 1867 | static struct clk tegra_clk_audio = { |
@@ -1926,7 +1926,7 @@ static struct clk_mux_sel mux_cclk[] = { | |||
1926 | { .input = &tegra_pll_p_out3, .value = 6}, | 1926 | { .input = &tegra_pll_p_out3, .value = 6}, |
1927 | { .input = &tegra_clk_d, .value = 7}, | 1927 | { .input = &tegra_clk_d, .value = 7}, |
1928 | { .input = &tegra_pll_x, .value = 8}, | 1928 | { .input = &tegra_pll_x, .value = 8}, |
1929 | { 0, 0}, | 1929 | { NULL, 0}, |
1930 | }; | 1930 | }; |
1931 | 1931 | ||
1932 | static struct clk_mux_sel mux_sclk[] = { | 1932 | static struct clk_mux_sel mux_sclk[] = { |
@@ -1938,7 +1938,7 @@ static struct clk_mux_sel mux_sclk[] = { | |||
1938 | { .input = &tegra_clk_d, .value = 5}, | 1938 | { .input = &tegra_clk_d, .value = 5}, |
1939 | { .input = &tegra_clk_32k, .value = 6}, | 1939 | { .input = &tegra_clk_32k, .value = 6}, |
1940 | { .input = &tegra_pll_m_out1, .value = 7}, | 1940 | { .input = &tegra_pll_m_out1, .value = 7}, |
1941 | { 0, 0}, | 1941 | { NULL, 0}, |
1942 | }; | 1942 | }; |
1943 | 1943 | ||
1944 | static struct clk tegra_clk_cclk = { | 1944 | static struct clk tegra_clk_cclk = { |
@@ -2009,7 +2009,7 @@ static struct clk_mux_sel mux_pllm_pllc_pllp_plla[] = { | |||
2009 | { .input = &tegra_pll_c, .value = 1}, | 2009 | { .input = &tegra_pll_c, .value = 1}, |
2010 | { .input = &tegra_pll_p, .value = 2}, | 2010 | { .input = &tegra_pll_p, .value = 2}, |
2011 | { .input = &tegra_pll_a_out0, .value = 3}, | 2011 | { .input = &tegra_pll_a_out0, .value = 3}, |
2012 | { 0, 0}, | 2012 | { NULL, 0}, |
2013 | }; | 2013 | }; |
2014 | 2014 | ||
2015 | static struct clk_mux_sel mux_pllm_pllc_pllp_clkm[] = { | 2015 | static struct clk_mux_sel mux_pllm_pllc_pllp_clkm[] = { |
@@ -2017,7 +2017,7 @@ static struct clk_mux_sel mux_pllm_pllc_pllp_clkm[] = { | |||
2017 | { .input = &tegra_pll_c, .value = 1}, | 2017 | { .input = &tegra_pll_c, .value = 1}, |
2018 | { .input = &tegra_pll_p, .value = 2}, | 2018 | { .input = &tegra_pll_p, .value = 2}, |
2019 | { .input = &tegra_clk_m, .value = 3}, | 2019 | { .input = &tegra_clk_m, .value = 3}, |
2020 | { 0, 0}, | 2020 | { NULL, 0}, |
2021 | }; | 2021 | }; |
2022 | 2022 | ||
2023 | static struct clk_mux_sel mux_pllp_pllc_pllm_clkm[] = { | 2023 | static struct clk_mux_sel mux_pllp_pllc_pllm_clkm[] = { |
@@ -2025,7 +2025,7 @@ static struct clk_mux_sel mux_pllp_pllc_pllm_clkm[] = { | |||
2025 | { .input = &tegra_pll_c, .value = 1}, | 2025 | { .input = &tegra_pll_c, .value = 1}, |
2026 | { .input = &tegra_pll_m, .value = 2}, | 2026 | { .input = &tegra_pll_m, .value = 2}, |
2027 | { .input = &tegra_clk_m, .value = 3}, | 2027 | { .input = &tegra_clk_m, .value = 3}, |
2028 | { 0, 0}, | 2028 | { NULL, 0}, |
2029 | }; | 2029 | }; |
2030 | 2030 | ||
2031 | static struct clk_mux_sel mux_pllaout0_audio2x_pllp_clkm[] = { | 2031 | static struct clk_mux_sel mux_pllaout0_audio2x_pllp_clkm[] = { |
@@ -2033,7 +2033,7 @@ static struct clk_mux_sel mux_pllaout0_audio2x_pllp_clkm[] = { | |||
2033 | {.input = &tegra_clk_audio_2x, .value = 1}, | 2033 | {.input = &tegra_clk_audio_2x, .value = 1}, |
2034 | {.input = &tegra_pll_p, .value = 2}, | 2034 | {.input = &tegra_pll_p, .value = 2}, |
2035 | {.input = &tegra_clk_m, .value = 3}, | 2035 | {.input = &tegra_clk_m, .value = 3}, |
2036 | { 0, 0}, | 2036 | { NULL, 0}, |
2037 | }; | 2037 | }; |
2038 | 2038 | ||
2039 | static struct clk_mux_sel mux_pllp_plld_pllc_clkm[] = { | 2039 | static struct clk_mux_sel mux_pllp_plld_pllc_clkm[] = { |
@@ -2041,7 +2041,7 @@ static struct clk_mux_sel mux_pllp_plld_pllc_clkm[] = { | |||
2041 | {.input = &tegra_pll_d_out0, .value = 1}, | 2041 | {.input = &tegra_pll_d_out0, .value = 1}, |
2042 | {.input = &tegra_pll_c, .value = 2}, | 2042 | {.input = &tegra_pll_c, .value = 2}, |
2043 | {.input = &tegra_clk_m, .value = 3}, | 2043 | {.input = &tegra_clk_m, .value = 3}, |
2044 | { 0, 0}, | 2044 | { NULL, 0}, |
2045 | }; | 2045 | }; |
2046 | 2046 | ||
2047 | static struct clk_mux_sel mux_pllp_pllc_audio_clkm_clk32[] = { | 2047 | static struct clk_mux_sel mux_pllp_pllc_audio_clkm_clk32[] = { |
@@ -2050,39 +2050,39 @@ static struct clk_mux_sel mux_pllp_pllc_audio_clkm_clk32[] = { | |||
2050 | {.input = &tegra_clk_audio, .value = 2}, | 2050 | {.input = &tegra_clk_audio, .value = 2}, |
2051 | {.input = &tegra_clk_m, .value = 3}, | 2051 | {.input = &tegra_clk_m, .value = 3}, |
2052 | {.input = &tegra_clk_32k, .value = 4}, | 2052 | {.input = &tegra_clk_32k, .value = 4}, |
2053 | { 0, 0}, | 2053 | { NULL, 0}, |
2054 | }; | 2054 | }; |
2055 | 2055 | ||
2056 | static struct clk_mux_sel mux_pllp_pllc_pllm[] = { | 2056 | static struct clk_mux_sel mux_pllp_pllc_pllm[] = { |
2057 | {.input = &tegra_pll_p, .value = 0}, | 2057 | {.input = &tegra_pll_p, .value = 0}, |
2058 | {.input = &tegra_pll_c, .value = 1}, | 2058 | {.input = &tegra_pll_c, .value = 1}, |
2059 | {.input = &tegra_pll_m, .value = 2}, | 2059 | {.input = &tegra_pll_m, .value = 2}, |
2060 | { 0, 0}, | 2060 | { NULL, 0}, |
2061 | }; | 2061 | }; |
2062 | 2062 | ||
2063 | static struct clk_mux_sel mux_clk_m[] = { | 2063 | static struct clk_mux_sel mux_clk_m[] = { |
2064 | { .input = &tegra_clk_m, .value = 0}, | 2064 | { .input = &tegra_clk_m, .value = 0}, |
2065 | { 0, 0}, | 2065 | { NULL, 0}, |
2066 | }; | 2066 | }; |
2067 | 2067 | ||
2068 | static struct clk_mux_sel mux_pllp_out3[] = { | 2068 | static struct clk_mux_sel mux_pllp_out3[] = { |
2069 | { .input = &tegra_pll_p_out3, .value = 0}, | 2069 | { .input = &tegra_pll_p_out3, .value = 0}, |
2070 | { 0, 0}, | 2070 | { NULL, 0}, |
2071 | }; | 2071 | }; |
2072 | 2072 | ||
2073 | static struct clk_mux_sel mux_plld[] = { | 2073 | static struct clk_mux_sel mux_plld[] = { |
2074 | { .input = &tegra_pll_d, .value = 0}, | 2074 | { .input = &tegra_pll_d, .value = 0}, |
2075 | { 0, 0}, | 2075 | { NULL, 0}, |
2076 | }; | 2076 | }; |
2077 | 2077 | ||
2078 | static struct clk_mux_sel mux_clk_32k[] = { | 2078 | static struct clk_mux_sel mux_clk_32k[] = { |
2079 | { .input = &tegra_clk_32k, .value = 0}, | 2079 | { .input = &tegra_clk_32k, .value = 0}, |
2080 | { 0, 0}, | 2080 | { NULL, 0}, |
2081 | }; | 2081 | }; |
2082 | 2082 | ||
2083 | static struct clk_mux_sel mux_pclk[] = { | 2083 | static struct clk_mux_sel mux_pclk[] = { |
2084 | { .input = &tegra_clk_pclk, .value = 0}, | 2084 | { .input = &tegra_clk_pclk, .value = 0}, |
2085 | { 0, 0}, | 2085 | { NULL, 0}, |
2086 | }; | 2086 | }; |
2087 | 2087 | ||
2088 | static struct clk tegra_clk_emc = { | 2088 | static struct clk tegra_clk_emc = { |