From patchwork Fri Sep 28 11:05:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1518661 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 354673FE80 for ; Fri, 28 Sep 2012 11:05:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287Ab2I1LFn (ORCPT ); Fri, 28 Sep 2012 07:05:43 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:59407 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294Ab2I1LFm (ORCPT ); Fri, 28 Sep 2012 07:05:42 -0400 Received: from axis700.grange (dslb-178-001-143-176.pools.arcor-ip.net [178.1.143.176]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MAeNv-1TBH7E2h2J-00BtPe; Fri, 28 Sep 2012 13:05:28 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 3B81F189B0D; Fri, 28 Sep 2012 13:05:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 38578189AF7; Fri, 28 Sep 2012 13:05:27 +0200 (CEST) Date: Fri, 28 Sep 2012 13:05:27 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-media@vger.kernel.org cc: devicetree-discuss@lists.ozlabs.org, Sylwester Nawrocki , Laurent Pinchart , Hans Verkuil , Magnus Damm , linux-sh@vger.kernel.org, Mark Brown , Stephen Warren , Arnd Bergmann , Grant Likely Subject: [PATCH 15/14] OF: define of_*_cmp() macros also if CONFIG_OF isn't set In-Reply-To: <1348754853-28619-3-git-send-email-g.liakhovetski@gmx.de> Message-ID: References: <1348754853-28619-1-git-send-email-g.liakhovetski@gmx.de> <1348754853-28619-3-git-send-email-g.liakhovetski@gmx.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:jHXO9ANEP0lMwYVw5oTWeEjAhLWDigZFrVZTCzVgggb 9XdOkWlOhS0WdG9rGhvN1XNs2JbaFYIFnGMirLSSP1cAQ0B+uW r2CTybJE0LauhwNCgOqvc2Pkeo5MOZJlxNFCcAKLJEPbjf8Qcc FjZQ9saZpS4iMpdqTSKyTI9EuF2VmCEUjTGlZQaprVulTfOD2u pp47m1OzgmhCP2ueJEje/PfuFKRcah7k7zp3Kq57OavBh2l41+ x9qeDHqZ4amHd/9s/xV/JGsg9zNOLxMrg9NSmn6MIjxppj2d2L F5LNu5QRgYW1JGPHQpUlpu9tzpUgyOAvYtVFm4tlLhfOPHwDbT jjFjwMKLZOudwN5rONBHjajYmZ6JP9awHy41E9FY89T+7OBgSP OjrHFdm2hLBBQ== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org of_*_cmp() macros do not depend on any OF functions and can be defined also if CONFIG_OF isn't set. Also include linux/string.h, required by those macros. Signed-off-by: Guennadi Liakhovetski --- These definitions are also required for "# CONFIG_OF is not set" builds. include/linux/of.h | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/linux/of.h b/include/linux/of.h index 3636fae..ad2e79b 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -85,6 +85,14 @@ static inline struct device_node *of_node_get(struct device_node *node) static inline void of_node_put(struct device_node *node) { } #endif /* !CONFIG_OF_DYNAMIC */ +/* Default string compare functions, Allow arch asm/prom.h to override */ +#if !defined(of_compat_cmp) +#include +#define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2)) +#define of_prop_cmp(s1, s2) strcmp((s1), (s2)) +#define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) +#endif + #ifdef CONFIG_OF /* Pointer for first entry in chain of all nodes. */ @@ -143,13 +151,6 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size) #define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 #endif -/* Default string compare functions, Allow arch asm/prom.h to override */ -#if !defined(of_compat_cmp) -#define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2)) -#define of_prop_cmp(s1, s2) strcmp((s1), (s2)) -#define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) -#endif - /* flag descriptions */ #define OF_DYNAMIC 1 /* node and properties were allocated via kmalloc */ #define OF_DETACHED 2 /* node has been detached from the device tree */