diff options
author | Heiko Stuebner <heiko@sntech.de> | 2015-07-05 11:00:15 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-06 15:07:38 -0700 |
commit | 7c494ad0581a31b20d2e8c397e0a28a6ffcabf8a (patch) | |
tree | 1b773d9b4bf49f41afb240fefefa697c3261f4ff /drivers/clk/rockchip/clk-mmc-phase.c | |
parent | 8a76f443a9ea6f7f72ede9f95fe0ca5b90f09a43 (diff) | |
download | op-kernel-dev-7c494ad0581a31b20d2e8c397e0a28a6ffcabf8a.zip op-kernel-dev-7c494ad0581a31b20d2e8c397e0a28a6ffcabf8a.tar.gz |
clk: rockchip: fix issues in the mmc-phase clock
The review for the new inverter clock type uncovered some issues (missing
headers and name handling) that are also present in the mmc-phase clock
type, I got (to much) inspiration from. Fix these there too.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/rockchip/clk-mmc-phase.c')
-rw-r--r-- | drivers/clk/rockchip/clk-mmc-phase.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c index e9f8df32..f2c6889 100644 --- a/drivers/clk/rockchip/clk-mmc-phase.c +++ b/drivers/clk/rockchip/clk-mmc-phase.c @@ -15,6 +15,8 @@ #include <linux/slab.h> #include <linux/clk-provider.h> +#include <linux/io.h> +#include <linux/kernel.h> #include "clk.h" struct rockchip_mmc_clock { @@ -131,6 +133,7 @@ struct clk *rockchip_clk_register_mmc(const char *name, if (!mmc_clock) return NULL; + init.name = name; init.num_parents = num_parents; init.parent_names = parent_names; init.ops = &rockchip_mmc_clk_ops; @@ -139,9 +142,6 @@ struct clk *rockchip_clk_register_mmc(const char *name, mmc_clock->reg = reg; mmc_clock->shift = shift; - if (name) - init.name = name; - clk = clk_register(NULL, &mmc_clock->hw); if (IS_ERR(clk)) goto err_free; |