From bb6c7768385b200063a14d6615cc1246c3d00760 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sun, 29 Oct 2017 01:50:07 +0900
Subject: [PATCH] reset: remove remaining WARN_ON() in <linux/reset.h>
Git-commit: bb6c7768385b200063a14d6615cc1246c3d00760
References: Git-fixes
Patch-mainline: v4.16-rc1
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>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Coly Li <colyli@suse.de>
---
include/linux/reset.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/linux/reset.h b/include/linux/reset.h
index b681019fc04c..ed6fb0290797 100644
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
@@ -125,9 +125,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);
}
@@ -273,9 +270,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.16.4