From: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux-clk@vger.kernel.org, Stephen Boyd <sboyd@codeaurora.org>,
Mike Turquette <mturquette@linaro.org>,
Murilo Opsfelder Araujo <mopsfelder@gmail.com>
Subject: [PATCH 2/2] drivers: clk: clk.c: Make clk_is_orphan() dependent of CONFIG_OF
Date: Wed, 6 May 2015 21:51:01 -0300 [thread overview]
Message-ID: <1430959861-14925-3-git-send-email-mopsfelder@gmail.com> (raw)
In-Reply-To: <1430959861-14925-1-git-send-email-mopsfelder@gmail.com>
The function clk_is_orphan() is called only by
__of_clk_get_from_provider(), which depends on CONFIG_OF, so it does
make sense the move.
This change also gets rid of the following build message when CONFIG_OF
is not set:
drivers/clk/clk.c:2231:13: warning: ‘clk_is_orphan’ defined but not used [-Wunused-function]
Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
---
drivers/clk/clk.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index a961eb6..d748aa2 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2228,14 +2228,6 @@ static inline void clk_debug_unregister(struct clk_core *core)
}
#endif /* CONFIG_DEBUG_FS */
-static bool clk_is_orphan(const struct clk *clk)
-{
- if (!clk)
- return false;
-
- return clk->core->orphan;
-}
-
/**
* __clk_init - initialize the data structures in a struct clk
* @dev: device initializing this clk, placeholder for now
@@ -2950,6 +2942,14 @@ void of_clk_del_provider(struct device_node *np)
}
EXPORT_SYMBOL_GPL(of_clk_del_provider);
+static bool clk_is_orphan(const struct clk *clk)
+{
+ if (!clk)
+ return false;
+
+ return clk->core->orphan;
+}
+
struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec,
const char *dev_id, const char *con_id)
{
--
2.1.4
next prev parent reply other threads:[~2015-05-07 0:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 0:50 [PATCH 0/2] Small adjustments in drivers/clk/clk.c Murilo Opsfelder Araujo
2015-05-07 0:51 ` [PATCH 1/2] drivers: clk: clk.c: Add comments indicating the matching #ifdef blocks Murilo Opsfelder Araujo
2015-05-07 0:51 ` Murilo Opsfelder Araujo [this message]
2015-05-07 0:55 ` [PATCH 2/2] drivers: clk: clk.c: Make clk_is_orphan() dependent of CONFIG_OF Stephen Boyd
2015-05-07 0:59 ` Murilo Opsfelder Araújo
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=1430959861-14925-3-git-send-email-mopsfelder@gmail.com \
--to=mopsfelder@gmail.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.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