From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Dinh Nguyen To: stable@vger.kernel.org Cc: dinguyen@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org, Masahiro Yamada , Philipp Zabel Subject: [PATCHv2 for v4.19-stable 6/6] reset: remove remaining WARN_ON() in Date: Tue, 4 Dec 2018 09:34:48 -0600 Message-Id: <20181204153448.6189-7-dinguyen@kernel.org> In-Reply-To: <20181204153448.6189-1-dinguyen@kernel.org> References: <20181204153448.6189-1-dinguyen@kernel.org> List-ID: From: Masahiro Yamada commit bb6c7768385b200063a14d6615cc1246c3d00760 upstream. 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 Signed-off-by: Philipp Zabel --- include/linux/reset.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/reset.h b/include/linux/reset.h index 61a0dda3f981..7e99690dbc81 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -107,9 +107,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); } @@ -255,9 +252,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.17.1