From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] reset: remove remaining WARN_ON() in <linux/reset.h>
Date: Sun, 29 Oct 2017 01:50:07 +0900 [thread overview]
Message-ID: <1509209409-2698-2-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1509209409-2698-1-git-send-email-yamada.masahiro@socionext.com>
Commit bb475230b8e5 ("reset: make optional functions really optional")
gave a new meaning to _get_optional variants.
The differentiation by WARN_ON() is not needed any more. We already
have inconsistency about this; (devm_)reset_control_get_exclusive()
has WARN_ON() check, but of_reset_control_get_exclusive() does not.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
include/linux/reset.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/linux/reset.h b/include/linux/reset.h
index c2fe7b6..9329664 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -124,9 +124,6 @@ static inline int device_reset_optional(struct device *dev)
static inline struct reset_control *
__must_check reset_control_get_exclusive(struct device *dev, const char *id)
{
-#ifndef CONFIG_RESET_CONTROLLER
- WARN_ON(1);
-#endif
return __reset_control_get(dev, id, 0, false, false);
}
@@ -272,9 +269,6 @@ static inline struct reset_control *
__must_check devm_reset_control_get_exclusive(struct device *dev,
const char *id)
{
-#ifndef CONFIG_RESET_CONTROLLER
- WARN_ON(1);
-#endif
return __devm_reset_control_get(dev, id, 0, false, false);
}
--
2.7.4
next prev parent reply other threads:[~2017-10-28 16:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 16:50 [PATCH 1/4] reset: make device_reset_optional() really optional Masahiro Yamada
2017-10-28 16:50 ` Masahiro Yamada [this message]
2017-10-28 16:50 ` [PATCH 3/4] reset: minimize the number of headers included from <linux/reset.h> Masahiro Yamada
2017-10-28 16:50 ` [PATCH 4/4] reset: remove reset_control_get(_optional) Masahiro Yamada
2017-10-30 15:23 ` [PATCH 1/4] reset: make device_reset_optional() really optional Philipp Zabel
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=1509209409-2698-2-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
/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
all inboxes | Powered by JetHome®