From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/10] clk: align error return of basic clks registeration
Date: Tue, 27 Mar 2012 15:23:24 +0800 [thread overview]
Message-ID: <1332833009-4121-6-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1332833009-4121-1-git-send-email-shawn.guo@linaro.org>
clk_register_gate and clk_register_divider return NULL for error,
which is aligned with clk_register function. But clk_register_mux
and clk_register_fixed_rate return ERR_PTR. Change them to return
NULL for better aligning with other registeration functions.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/clk/clk-fixed-rate.c | 2 +-
drivers/clk/clk-mux.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c
index 027e477..d268439 100644
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
@@ -50,7 +50,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
if (!fixed) {
pr_err("%s: could not allocate fixed clk\n", __func__);
- return ERR_PTR(-ENOMEM);
+ return NULL;
}
/* struct clk_fixed_rate assignments */
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 5424488..19f3116 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -99,7 +99,7 @@ struct clk *clk_register_mux(struct device *dev, const char *name,
if (!mux) {
pr_err("%s: could not allocate mux clk\n", __func__);
- return ERR_PTR(-ENOMEM);
+ return NULL;
}
/* struct clk_mux assignments */
--
1.7.5.4
next prev parent reply other threads:[~2012-03-27 7:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 7:23 [PATCH 00/10] clk: cleanup on basic clks Shawn Guo
2012-03-27 7:23 ` [PATCH 01/10] clk: use kzalloc in clk_register_mux Shawn Guo
2012-03-27 23:31 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 02/10] clk: remove unnecessary EXPORT_SYMBOL_GPL Shawn Guo
2012-03-27 7:23 ` [PATCH 03/10] clk: add "const" for clk_ops of basic clks Shawn Guo
2012-03-27 23:29 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 04/10] clk: declare clk_ops of basic clks in clk-provider.h Shawn Guo
2012-03-28 21:20 ` Turquette, Mike
2012-03-27 7:23 ` Shawn Guo [this message]
2012-03-27 23:28 ` [PATCH 05/10] clk: align error return of basic clks registeration Turquette, Mike
2012-03-27 7:23 ` [PATCH 06/10] clk: fixed-rate: Don't open code kstrdup() Shawn Guo
2012-03-27 23:36 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 07/10] clk: Constify parent name arrays Shawn Guo
2012-03-28 1:03 ` Turquette, Mike
2012-03-28 10:07 ` Mark Brown
2012-03-27 7:23 ` [PATCH 08/10] clk: fixed-rate: registration error handling fixup Shawn Guo
2012-03-28 0:31 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 09/10] clk: dynamically allocate parent_names basic clk registration Shawn Guo
2012-03-27 8:55 ` Sascha Hauer
2012-03-27 12:51 ` Shawn Guo
2012-03-27 19:40 ` Sascha Hauer
2012-03-27 23:17 ` Turquette, Mike
2012-03-27 7:23 ` [PATCH 10/10] clk: copy parent_names in clk-mux registration Shawn Guo
2012-04-09 22:00 ` Turquette, Mike
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=1332833009-4121-6-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.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 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).