Merge 'clk-notify' into clk-next

* clk-notify:
  clk: Provide notifier stubs when !COMMON_CLK
This commit is contained in:
Stephen Boyd 2016-06-29 10:54:13 -07:00
commit 5ff5ec59c4
1 changed files with 14 additions and 2 deletions

View File

@ -20,8 +20,6 @@ struct device;
struct clk; struct clk;
#ifdef CONFIG_COMMON_CLK
/** /**
* DOC: clk notifier callback types * DOC: clk notifier callback types
* *
@ -78,6 +76,8 @@ struct clk_notifier_data {
unsigned long new_rate; unsigned long new_rate;
}; };
#ifdef CONFIG_COMMON_CLK
/** /**
* clk_notifier_register: register a clock rate-change notifier callback * clk_notifier_register: register a clock rate-change notifier callback
* @clk: clock whose rate we are interested in * @clk: clock whose rate we are interested in
@ -140,6 +140,18 @@ bool clk_is_match(const struct clk *p, const struct clk *q);
#else #else
static inline int clk_notifier_register(struct clk *clk,
struct notifier_block *nb)
{
return -ENOTSUPP;
}
static inline int clk_notifier_unregister(struct clk *clk,
struct notifier_block *nb)
{
return -ENOTSUPP;
}
static inline long clk_get_accuracy(struct clk *clk) static inline long clk_get_accuracy(struct clk *clk)
{ {
return -ENOTSUPP; return -ENOTSUPP;