From patchwork Fri Jan 9 23:57:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 42923 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3D5E02055F for ; Fri, 9 Jan 2015 23:59:35 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id c13sf9605779eek.2 for ; Fri, 09 Jan 2015 15:59:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=hOIt3V8068UVbcJXWEMtsVMuvJ8npFPKEREyRtj5M/o=; b=ODLVRVr6RNwdMJS5JhKUnX1FIO73IAaWwUofozIpkK7x37VcVPGBt9fPfaglsP6KV/ mE4MlCLHO81AWDUOm9dciKzzPUufnsfdCN3m0ZwGo8Fg+GCd73zhk9VFWJbaiRBBBV9p ooIAQhtJ4qP6DPCyZjqaEYQg9fO4S3lRikKx/9YQrjJV3n/vIZBD2v1pEjATBrKEaWMt lKH6hg8lXiGAvtq3feyKuPOCmfng6Jd5mRwxJ6HCAzu7xWw4ab9x2HaD5pbvSrnkO+uM FEyKs4P2QQWBA5Tyc3mEOJIKuAUld6Y1L5zbfYP/WauxQ83JLD5EtsQFAbP0+j/glj9z Ptpw== X-Gm-Message-State: ALoCoQkv8WTPL1rYFMhome3cXieMzwxGVRj1Qouv+YoOdUKklm1itWTvq8HNQDj7AwP0bnYxSm9/ X-Received: by 10.180.7.226 with SMTP id m2mr748586wia.5.1420847974407; Fri, 09 Jan 2015 15:59:34 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.130 with SMTP id f2ls481805lae.21.gmail; Fri, 09 Jan 2015 15:59:34 -0800 (PST) X-Received: by 10.112.42.47 with SMTP id k15mr24636721lbl.75.1420847974056; Fri, 09 Jan 2015 15:59:34 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id q9si14554310lag.91.2015.01.09.15.59.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Jan 2015 15:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id z12so10606515lbi.3 for ; Fri, 09 Jan 2015 15:59:34 -0800 (PST) X-Received: by 10.112.52.229 with SMTP id w5mr24323668lbo.52.1420847973955; Fri, 09 Jan 2015 15:59:33 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp479366lbb; Fri, 9 Jan 2015 15:59:33 -0800 (PST) X-Received: by 10.70.37.35 with SMTP id v3mr27490551pdj.4.1420847972158; Fri, 09 Jan 2015 15:59:32 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ut3si15179176pab.193.2015.01.09.15.59.31; Fri, 09 Jan 2015 15:59:32 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758524AbbAIX72 (ORCPT + 27 others); Fri, 9 Jan 2015 18:59:28 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:40742 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755798AbbAIX5p (ORCPT ); Fri, 9 Jan 2015 18:57:45 -0500 Received: by mail-pd0-f177.google.com with SMTP id ft15so20062765pdb.8 for ; Fri, 09 Jan 2015 15:57:44 -0800 (PST) X-Received: by 10.70.41.231 with SMTP id i7mr15134978pdl.102.1420847864776; Fri, 09 Jan 2015 15:57:44 -0800 (PST) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPSA id od13sm8108693pdb.18.2015.01.09.15.57.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Jan 2015 15:57:44 -0800 (PST) From: mathieu.poirier@linaro.org To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH 09/11] coresight: Fixing wrong #ifdef/#endif placement Date: Fri, 9 Jan 2015 16:57:20 -0700 Message-Id: <1420847842-31769-10-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420847842-31769-1-git-send-email-mathieu.poirier@linaro.org> References: <1420847842-31769-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mathieu.poirier@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Mathieu Poirier Fixing problem reported by: https://lkml.org/lkml/2015/1/6/86 The #ifdef/#endif is wrong and prevents the stub of function of_get_coresight_platform_data() from being visible when CONFIG_OF is not defined. Moving CONFIG_OF condition out of CONFIG_CORESIGHT, making them both independent. Signed-off-by: Mathieu Poirier --- include/linux/coresight.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 7cbfecbfa643..cd6d4c384ca3 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -230,10 +230,6 @@ extern void coresight_disable(struct coresight_device *csdev); extern int coresight_is_bit_set(u32 val, int position, int value); extern int coresight_timeout(void __iomem *addr, u32 offset, int position, int value); -#ifdef CONFIG_OF -extern struct coresight_platform_data *of_get_coresight_platform_data( - struct device *dev, struct device_node *node); -#endif #else static inline struct coresight_device * coresight_register(struct coresight_desc *desc) { return NULL; } @@ -245,10 +241,14 @@ static inline int coresight_is_bit_set(u32 val, int position, int value) { return 0; } static inline int coresight_timeout(void __iomem *addr, u32 offset, int position, int value) { return 1; } +#endif + #ifdef CONFIG_OF +extern struct coresight_platform_data *of_get_coresight_platform_data( + struct device *dev, struct device_node *node); +#else static inline struct coresight_platform_data *of_get_coresight_platform_data( struct device *dev, struct device_node *node) { return NULL; } #endif -#endif #endif