Commit bb6c7768 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Philipp Zabel

reset: remove remaining WARN_ON() in <linux/reset.h>

Commit bb475230 ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 1554bbd4
...@@ -125,9 +125,6 @@ static inline int device_reset_optional(struct device *dev) ...@@ -125,9 +125,6 @@ static inline int device_reset_optional(struct device *dev)
static inline struct reset_control * static inline struct reset_control *
__must_check reset_control_get_exclusive(struct device *dev, const char *id) __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); return __reset_control_get(dev, id, 0, false, false);
} }
...@@ -273,9 +270,6 @@ static inline struct reset_control * ...@@ -273,9 +270,6 @@ static inline struct reset_control *
__must_check devm_reset_control_get_exclusive(struct device *dev, __must_check devm_reset_control_get_exclusive(struct device *dev,
const char *id) const char *id)
{ {
#ifndef CONFIG_RESET_CONTROLLER
WARN_ON(1);
#endif
return __devm_reset_control_get(dev, id, 0, false, false); return __devm_reset_control_get(dev, id, 0, false, false);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment