From patchwork Wed Dec 9 15:24:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 58152 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp739013lbb; Wed, 9 Dec 2015 07:24:09 -0800 (PST) X-Received: by 10.66.149.229 with SMTP id ud5mr8584989pab.83.1449674649214; Wed, 09 Dec 2015 07:24:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n4si13283906pfi.133.2015.12.09.07.24.08; Wed, 09 Dec 2015 07:24:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbbLIPYH (ORCPT + 6 others); Wed, 9 Dec 2015 10:24:07 -0500 Received: from mail-oi0-f41.google.com ([209.85.218.41]:33794 "EHLO mail-oi0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369AbbLIPYG (ORCPT ); Wed, 9 Dec 2015 10:24:06 -0500 Received: by oies6 with SMTP id s6so28559589oie.1; Wed, 09 Dec 2015 07:24:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=heP9EMqTE6HWqcA57zR/Phi6332CHQie0+dohUCxQ5o=; b=gk4De7AMqCFgb540/SlhGwhAis/rGKzbiX/zBTwHjiA1Bg3PmTPUHM8Cazo+qvxTjR deKJr/tZzTLHojWlaric37oMS6fJrBatGqpH0/NBIkQYgc84qXQnuzwEe23DfHFbdXzQ tT5UE+KeUTc/+WXzumTuiCYeXDGokBfoSy4Eo46ZZYrh6sZtzqrP+2WMlTDdJiYSHm8k XMwbKzIhnKxNOPq+fe7UiR2W8JGm6Q6yZItNqZ6XtbjctGpZVNUrbCI+G8wNHuma4Mik 5VNCxTf3O/lXvr5kLbXek3/H+8f0z2vSvKkpcEo4U3QS1n/36ZfNv7E1QeG6QNuMmJF3 lEtA== X-Received: by 10.202.80.205 with SMTP id e196mr4410156oib.122.1449674645377; Wed, 09 Dec 2015 07:24:05 -0800 (PST) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id cu1sm3756803oeb.1.2015.12.09.07.24.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Dec 2015 07:24:04 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Frank Rowand Subject: [PATCH] of/irq: move of_msi_map_rid declaration to the correct ifdef section Date: Wed, 9 Dec 2015 09:24:01 -0600 Message-Id: <1449674641-24094-1-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.5.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In checking fixes for of_irq_find_parent declaration location, I found that of_msi_map_rid is also wrong. of_msi_map_rid is not implemented for Sparc, so it should not be in the Sparc specific section of the header. Move it to just depend on OF_IRQ. Cc: Frank Rowand Signed-off-by: Rob Herring --- include/linux/of_irq.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index f648acf..1e0deb8 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -53,6 +53,7 @@ extern struct irq_domain *of_msi_get_domain(struct device *dev, extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 rid); extern void of_msi_configure(struct device *dev, struct device_node *np); +u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); #else static inline int of_irq_count(struct device_node *dev) { @@ -90,6 +91,11 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev static inline void of_msi_configure(struct device *dev, struct device_node *np) { } +static inline u32 of_msi_map_rid(struct device *dev, + struct device_node *msi_np, u32 rid_in) +{ + return rid_in; +} #endif #if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC) @@ -99,7 +105,6 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) * so declare it here regardless of the CONFIG_OF_IRQ setting. */ extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); -u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); #else /* !CONFIG_OF && !CONFIG_SPARC */ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, @@ -107,12 +112,6 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, { return 0; } - -static inline u32 of_msi_map_rid(struct device *dev, - struct device_node *msi_np, u32 rid_in) -{ - return rid_in; -} #endif /* !CONFIG_OF */ #endif /* __OF_IRQ_H */