diff mbox series

[2/4] reset: remove remaining WARN_ON() in <linux/reset.h>

Message ID 1509209409-2698-2-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit bb6c7768385b200063a14d6615cc1246c3d00760
Headers show
Series [1/4] reset: make device_reset_optional() really optional | expand

Commit Message

Masahiro Yamada Oct. 28, 2017, 4:50 p.m. UTC 
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(-)

-- 
2.7.4
diff mbox series

Patch

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);
 }