diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
| commit | 4af6600fd793023c01634cca5abfe4a2b707788f (patch) | |
| tree | 9e3a830d7782512b492011932ddd789d13a900c4 /drivers/clk/clk-efm32gg.c | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: i8042 - disable active multiplexing by default (diff) | |
| download | linux-4af6600fd793023c01634cca5abfe4a2b707788f.tar.xz linux-4af6600fd793023c01634cca5abfe4a2b707788f.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'drivers/clk/clk-efm32gg.c')
| -rw-r--r-- | drivers/clk/clk-efm32gg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/clk-efm32gg.c b/drivers/clk/clk-efm32gg.c index bac2ddf49d02..73a8d0ff530c 100644 --- a/drivers/clk/clk-efm32gg.c +++ b/drivers/clk/clk-efm32gg.c @@ -22,7 +22,7 @@ static struct clk_onecell_data clk_data = { .clk_num = ARRAY_SIZE(clk), }; -static int __init efm32gg_cmu_init(struct device_node *np) +static void __init efm32gg_cmu_init(struct device_node *np) { int i; void __iomem *base; @@ -33,7 +33,7 @@ static int __init efm32gg_cmu_init(struct device_node *np) base = of_iomap(np, 0); if (!base) { pr_warn("Failed to map address range for efm32gg,cmu node\n"); - return -EADDRNOTAVAIL; + return; } clk[clk_HFXO] = clk_register_fixed_rate(NULL, "HFXO", NULL, @@ -76,6 +76,6 @@ static int __init efm32gg_cmu_init(struct device_node *np) clk[clk_HFPERCLKDAC0] = clk_register_gate(NULL, "HFPERCLK.DAC0", "HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL); - return of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); } CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init); |