All of lore.kernel.org
 help / color / mirror / Atom feed
From: lethal@linux-sh.org (Paul Mundt)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 3/5] of: add clock providers
Date: Wed, 26 Jan 2011 14:47:09 +0900	[thread overview]
Message-ID: <20110126054709.GC19428@linux-sh.org> (raw)
In-Reply-To: <20110126044422.16410.78703.stgit@localhost6.localdomain6> <20110126044416.16410.68942.stgit@localhost6.localdomain6>

On Tue, Jan 25, 2011 at 09:44:17PM -0700, Grant Likely wrote:
> +struct clk *of_clk_get(struct device *dev, const char *id)
> +{
...
> +	snprintf(prop_name, 32, "%s-clock", id ? id : "bus");
> +	prop = of_get_property(dev->of_node, prop_name, &sz);
> +	if (!prop || sz < 4)
> +		return NULL;
...
> +	 * size of the property. */
> +	if (strlen(prop) + 1 > sz)
> +		return NULL;
> +
> +	/* Find the clock provider node; check if it is registered as a
> +	 * provider, and ask it for the relevant clk structure */
> +	provnode = of_find_node_by_phandle(provhandle);
> +	if (!provnode) {
> +		pr_warn("%s: %s property in node %s references invalid phandle",
> +			__func__, prop_name, dev->of_node->full_name);
> +		return NULL;
...

> +	return clk;
> +}

On Tue, Jan 25, 2011 at 09:44:22PM -0700, Grant Likely wrote:
> @@ -79,6 +81,11 @@ EXPORT_SYMBOL(clk_get_sys);
>  struct clk *clk_get(struct device *dev, const char *con_id)
>  {
>  	const char *dev_id = dev ? dev_name(dev) : NULL;
> +	struct clk *clk;
> +
> +	clk = of_clk_get(dev, con_id);
> +	if (clk && __clk_get(clk))
> +		return clk;
>  
>  	return clk_get_sys(dev_id, con_id);
>  }
> 

The return value for clk_get() by almost all users is checked for
specifically with IS_ERR() rather than an IS_ERR_OR_NULL(), so you're
going to want to change your of_clk_get() error paths to return
ERR_PTR()'s directly, or wrap it up like clk_get_sys() does.

Given that there are multiple reasons why of_clk_get() can fail however,
it's probably worth handing down the actual error rather than simply
chomping it in to an -ENOENT.

WARNING: multiple messages have this Message-ID (diff)
From: Paul Mundt <lethal@linux-sh.org>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: devicetree-discuss@lists.ozlabs.org, jeremy.kerr@canonical.com,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, nicolas.pitre@linaro.org
Subject: Re: [RFC PATCH 3/5] of: add clock providers
Date: Wed, 26 Jan 2011 14:47:09 +0900	[thread overview]
Message-ID: <20110126054709.GC19428@linux-sh.org> (raw)
In-Reply-To: <20110126044422.16410.78703.stgit@localhost6.localdomain6> <20110126044416.16410.68942.stgit@localhost6.localdomain6>

On Tue, Jan 25, 2011 at 09:44:17PM -0700, Grant Likely wrote:
> +struct clk *of_clk_get(struct device *dev, const char *id)
> +{
...
> +	snprintf(prop_name, 32, "%s-clock", id ? id : "bus");
> +	prop = of_get_property(dev->of_node, prop_name, &sz);
> +	if (!prop || sz < 4)
> +		return NULL;
...
> +	 * size of the property. */
> +	if (strlen(prop) + 1 > sz)
> +		return NULL;
> +
> +	/* Find the clock provider node; check if it is registered as a
> +	 * provider, and ask it for the relevant clk structure */
> +	provnode = of_find_node_by_phandle(provhandle);
> +	if (!provnode) {
> +		pr_warn("%s: %s property in node %s references invalid phandle",
> +			__func__, prop_name, dev->of_node->full_name);
> +		return NULL;
...

> +	return clk;
> +}

On Tue, Jan 25, 2011 at 09:44:22PM -0700, Grant Likely wrote:
> @@ -79,6 +81,11 @@ EXPORT_SYMBOL(clk_get_sys);
>  struct clk *clk_get(struct device *dev, const char *con_id)
>  {
>  	const char *dev_id = dev ? dev_name(dev) : NULL;
> +	struct clk *clk;
> +
> +	clk = of_clk_get(dev, con_id);
> +	if (clk && __clk_get(clk))
> +		return clk;
>  
>  	return clk_get_sys(dev_id, con_id);
>  }
> 

The return value for clk_get() by almost all users is checked for
specifically with IS_ERR() rather than an IS_ERR_OR_NULL(), so you're
going to want to change your of_clk_get() error paths to return
ERR_PTR()'s directly, or wrap it up like clk_get_sys() does.

Given that there are multiple reasons why of_clk_get() can fail however,
it's probably worth handing down the actual error rather than simply
chomping it in to an -ENOENT.

  reply	other threads:[~2011-01-26  5:47 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-26  4:44 [RFC PATCH 0/5] arm/dt: register devices from device tree Grant Likely
2011-01-26  4:44 ` Grant Likely
2011-01-26  4:44 ` Grant Likely
2011-01-26  4:44 ` [RFC PATCH 1/5] arm/dt: Add dt machine definition Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26 18:27   ` [RFC,1/5] " Milton Miller
2011-01-26 18:27     ` Milton Miller
2011-01-27  3:31     ` Grant Likely
2011-01-26  4:44 ` [RFC PATCH 2/5] drivers/amba: probe via device tree Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44 ` [RFC PATCH 3/5] of: add clock providers Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  5:47   ` Paul Mundt [this message]
2011-01-26  5:47     ` Paul Mundt
2011-02-01 22:42   ` Rob Herring
2011-02-01 22:42     ` Rob Herring
2011-01-26  4:44 ` [RFC PATCH 4/5] arm/clkdev: lookup clocks from OF " Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44 ` [RFC PATCH 5/5] arm/versatile: add a device tree versatile platform Grant Likely
2011-01-26  4:44   ` Grant Likely
2011-01-26  4:44   ` Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110126054709.GC19428@linux-sh.org \
    --to=lethal@linux-sh.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.