aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2015-01-23 12:03:29 +0100
committerMichael Turquette <mturquette@linaro.org>2015-01-28 10:40:18 -0800
commitaf0f349b2996f9f3d83e5aac1edf58fff727a0e0 (patch)
tree4180b6c0b38ab878bf85ae217944fcbf4ab6df7a
parentclk: Remove unneeded NULL checks (diff)
downloadlinux-dev-af0f349b2996f9f3d83e5aac1edf58fff727a0e0.tar.xz
linux-dev-af0f349b2996f9f3d83e5aac1edf58fff727a0e0.zip
clk: Remove __clk_register
As it has never been used. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Michael Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/clk.c42
-rw-r--r--include/linux/clk-private.h2
2 files changed, 0 insertions, 44 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 05986e389bf8..b701e7c195e4 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2032,48 +2032,6 @@ out:
}
/**
- * __clk_register - register a clock and return a cookie.
- *
- * Same as clk_register, except that the .clk field inside hw shall point to a
- * preallocated (generally statically allocated) struct clk. None of the fields
- * of the struct clk need to be initialized.
- *
- * The data pointed to by .init and .clk field shall NOT be marked as init
- * data.
- *
- * __clk_register is only exposed via clk-private.h and is intended for use with
- * very large numbers of clocks that need to be statically initialized. It is
- * a layering violation to include clk-private.h from any code which implements
- * a clock's .ops; as such any statically initialized clock data MUST be in a
- * separate C file from the logic that implements its operations. Returns 0
- * on success, otherwise an error code.
- */
-struct clk *__clk_register(struct device *dev, struct clk_hw *hw)
-{
- int ret;
- struct clk *clk;
-
- clk = hw->clk;
- clk->name = hw->init->name;
- clk->ops = hw->init->ops;
- clk->hw = hw;
- clk->flags = hw->init->flags;
- clk->parent_names = hw->init->parent_names;
- clk->num_parents = hw->init->num_parents;
- if (dev && dev->driver)
- clk->owner = dev->driver->owner;
- else
- clk->owner = NULL;
-
- ret = __clk_init(dev, clk);
- if (ret)
- return ERR_PTR(ret);
-
- return clk;
-}
-EXPORT_SYMBOL_GPL(__clk_register);
-
-/**
* clk_register - allocate a new clock, register it and return an opaque cookie
* @dev: device that is registering this clock
* @hw: link to hardware-specific clock data
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index 0ca5f6046920..c5f40d07686c 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -214,7 +214,5 @@ struct clk {
*/
int __clk_init(struct device *dev, struct clk *clk);
-struct clk *__clk_register(struct device *dev, struct clk_hw *hw);
-
#endif /* CONFIG_COMMON_CLK */
#endif /* CLK_PRIVATE_H */