From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751482AbdJ1QvC (ORCPT ); Sat, 28 Oct 2017 12:51:02 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:39210 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422AbdJ1QvB (ORCPT ); Sat, 28 Oct 2017 12:51:01 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v9SGoDXG021928 X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: Philipp Zabel Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] reset: remove remaining WARN_ON() in Date: Sun, 29 Oct 2017 01:50:07 +0900 Message-Id: <1509209409-2698-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509209409-2698-1-git-send-email-yamada.masahiro@socionext.com> References: <1509209409-2698-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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