aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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:
2032} 2032}
2033 2033
2034/** 2034/**
2035 * __clk_register - register a clock and return a cookie.
2036 *
2037 * Same as clk_register, except that the .clk field inside hw shall point to a
2038 * preallocated (generally statically allocated) struct clk. None of the fields
2039 * of the struct clk need to be initialized.
2040 *
2041 * The data pointed to by .init and .clk field shall NOT be marked as init
2042 * data.
2043 *
2044 * __clk_register is only exposed via clk-private.h and is intended for use with
2045 * very large numbers of clocks that need to be statically initialized. It is
2046 * a layering violation to include clk-private.h from any code which implements
2047 * a clock's .ops; as such any statically initialized clock data MUST be in a
2048 * separate C file from the logic that implements its operations. Returns 0
2049 * on success, otherwise an error code.
2050 */
2051struct clk *__clk_register(struct device *dev, struct clk_hw *hw)
2052{
2053 int ret;
2054 struct clk *clk;
2055
2056 clk = hw->clk;
2057 clk->name = hw->init->name;
2058 clk->ops = hw->init->ops;
2059 clk->hw = hw;
2060 clk->flags = hw->init->flags;
2061 clk->parent_names = hw->init->parent_names;
2062 clk->num_parents = hw->init->num_parents;
2063 if (dev && dev->driver)
2064 clk->owner = dev->driver->owner;
2065 else
2066 clk->owner = NULL;
2067
2068 ret = __clk_init(dev, clk);
2069 if (ret)
2070 return ERR_PTR(ret);
2071
2072 return clk;
2073}
2074EXPORT_SYMBOL_GPL(__clk_register);
2075
2076/**
2077 * clk_register - allocate a new clock, register it and return an opaque cookie 2035 * clk_register - allocate a new clock, register it and return an opaque cookie
2078 * @dev: device that is registering this clock 2036 * @dev: device that is registering this clock
2079 * @hw: link to hardware-specific clock data 2037 * @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 {
214 */ 214 */
215int __clk_init(struct device *dev, struct clk *clk); 215int __clk_init(struct device *dev, struct clk *clk);
216 216
217struct clk *__clk_register(struct device *dev, struct clk_hw *hw);
218
219#endif /* CONFIG_COMMON_CLK */ 217#endif /* CONFIG_COMMON_CLK */
220#endif /* CLK_PRIVATE_H */ 218#endif /* CLK_PRIVATE_H */