From: Tony Lindgren <tony@atomide.com>
To: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-omap@vger.kernel.org,
linux-sh@vger.kernel.org
Subject: Re: [PATCH 12/14] ARM: omap2: use clkdev_add_alias()
Date: Fri, 3 Apr 2015 16:50:04 -0700 [thread overview]
Message-ID: <20150403235003.GF18048@atomide.com> (raw)
In-Reply-To: <E1Ye59o-0001Bh-3u@rmk-PC.arm.linux.org.uk>
* Russell King <rmk+kernel@arm.linux.org.uk> [150403 10:14]:
> When creating aliases of existing clkdev clocks, use clkdev_add_alias()
> isntead of open coding the lookup and clk_lookup creation.
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/omap_device.c | 24 +++++++++---------------
> 1 file changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
> index be9541e18650..521c32e7778e 100644
> --- a/arch/arm/mach-omap2/omap_device.c
> +++ b/arch/arm/mach-omap2/omap_device.c
> @@ -47,7 +47,7 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,
> const char *clk_name)
> {
> struct clk *r;
> - struct clk_lookup *l;
> + int rc;
>
> if (!clk_alias || !clk_name)
> return;
> @@ -62,21 +62,15 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,
> return;
> }
>
> - r = clk_get(NULL, clk_name);
> - if (IS_ERR(r)) {
> - dev_err(&od->pdev->dev,
> - "clk_get for %s failed\n", clk_name);
> - return;
> + rc = clk_add_alias(clk_alias, dev_name(&od->pdev->dev), clk_name, NULL);
> + if (rc) {
> + if (rc == -ENODEV || rc == -ENOMEM)
> + dev_err(&od->pdev->dev,
> + "clkdev_alloc for %s failed\n", clk_alias);
> + else
> + dev_err(&od->pdev->dev,
> + "clk_get for %s failed\n", clk_name);
> }
> -
> - l = clkdev_alloc(r, clk_alias, dev_name(&od->pdev->dev));
> - if (!l) {
> - dev_err(&od->pdev->dev,
> - "clkdev_alloc for %s failed\n", clk_alias);
> - return;
> - }
> -
> - clkdev_add(l);
> }
>
> /**
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2015-04-03 23:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-03 17:11 [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux
2015-04-03 17:12 ` [PATCH 01/14] clk: update clk API documentation to clarify clk_round_rate() Russell King
2015-04-03 17:12 ` [PATCH 02/14] clkdev: drop __init from clkdev_add_table() Russell King
2015-04-03 17:12 ` [PATCH 03/14] clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h Russell King
2015-04-03 23:49 ` Tony Lindgren
2015-04-04 12:43 ` Robert Jarzmik
2015-04-04 12:53 ` Russell King - ARM Linux
2015-04-06 19:04 ` Stephen Boyd
2015-04-07 10:05 ` Robert Jarzmik
2015-04-07 12:42 ` Russell King - ARM Linux
2015-04-06 5:50 ` Sekhar Nori
2015-04-03 17:12 ` [PATCH 04/14] clkdev: const-ify connection id to clk_add_alias() Russell King
2015-04-03 17:12 ` [PATCH 05/14] clkdev: use clk_hw internally Russell King
2015-04-06 20:18 ` Stephen Boyd
2015-04-03 17:12 ` [PATCH 06/14] clkdev: add clkdev_create() helper Russell King
2015-04-06 20:19 ` Stephen Boyd
2015-04-07 12:43 ` Russell King - ARM Linux
2015-04-07 23:09 ` Stephen Boyd
2015-04-03 17:12 ` [PATCH 07/14] media: omap3isp: remove unused clkdev Russell King
2015-04-03 21:44 ` Laurent Pinchart
2015-04-05 14:20 ` Russell King - ARM Linux
2015-04-07 9:42 ` Laurent Pinchart
2015-04-07 12:45 ` Russell King - ARM Linux
2015-04-07 14:38 ` Laurent Pinchart
2015-04-03 17:13 ` [PATCH 08/14] SH: use clkdev_add_table() Russell King
2015-04-03 17:13 ` [PATCH 09/14] ARM: lpc32xx: convert to " Russell King
2015-04-03 17:13 ` [PATCH 10/14] ARM: orion: use clkdev_create() Russell King
2015-04-04 0:17 ` Andrew Lunn
2015-04-07 13:20 ` Gregory CLEMENT
2015-04-07 14:01 ` Russell King - ARM Linux
2015-04-07 14:20 ` Gregory CLEMENT
2015-04-03 17:13 ` [PATCH 11/14] ARM: omap2: " Russell King
2015-04-03 23:49 ` Tony Lindgren
2015-04-03 17:13 ` [PATCH 12/14] ARM: omap2: use clkdev_add_alias() Russell King
2015-04-03 23:50 ` Tony Lindgren [this message]
2015-04-03 17:13 ` [PATCH 13/14] ASoC: migor: use clkdev_create() Russell King
2015-04-03 17:13 ` [PATCH 14/14] clk: s2mps11: " Russell King
2015-04-03 17:16 ` [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux
2015-04-05 9:04 ` Geert Uytterhoeven
2015-04-05 14:13 ` Russell King - ARM Linux
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=20150403235003.GF18048@atomide.com \
--to=tony@atomide.com \
--cc=alsa-devel@alsa-project.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).