From ff778b388262d499425c6408e8c196b6c72135fc Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Mon, 26 Mar 2012 16:15:52 -0700 Subject: [PATCH] --- yaml --- r: 308192 b: refs/heads/master c: d4d7e3ddc76c5ae3b4fbd15cb6f30aa78c28d788 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ac64f83c001..8cb1e8bf7343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7452b2191cd55fb3fd6ad65344466ddcdbe4676e +refs/heads/master: d4d7e3ddc76c5ae3b4fbd15cb6f30aa78c28d788 diff --git a/trunk/drivers/clk/clk.c b/trunk/drivers/clk/clk.c index d83a9e09e1bf..9924aec17aad 100644 --- a/trunk/drivers/clk/clk.c +++ b/trunk/drivers/clk/clk.c @@ -1202,6 +1202,20 @@ void __clk_init(struct device *dev, struct clk *clk) if (__clk_lookup(clk->name)) goto out; + /* check that clk_ops are sane. See Documentation/clk.txt */ + if (clk->ops->set_rate && + !(clk->ops->round_rate && clk->ops->recalc_rate)) { + pr_warning("%s: %s must implement .round_rate & .recalc_rate\n", + __func__, clk->name); + goto out; + } + + if (clk->ops->set_parent && !clk->ops->get_parent) { + pr_warning("%s: %s must implement .get_parent & .set_parent\n", + __func__, clk->name); + goto out; + } + /* throw a WARN if any entries in parent_names are NULL */ for (i = 0; i < clk->num_parents; i++) WARN(!clk->parent_names[i],