From patchwork Mon Jan 23 21:07:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 137472 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 7C45F10088D for ; Tue, 24 Jan 2012 08:09:11 +1100 (EST) Received: from mail-yx0-f179.google.com (mail-yx0-f179.google.com [209.85.213.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4A91E1007D3; Tue, 24 Jan 2012 08:08:07 +1100 (EST) Received: by yenl11 with SMTP id l11so1465898yen.38 for ; Mon, 23 Jan 2012 13:08:05 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.124.97 with SMTP id w61mr12660111yhh.63.1327352885471; Mon, 23 Jan 2012 13:08:05 -0800 (PST) Received: from localhost (S0106d8b37715ee14.cg.shawcable.net. [68.146.14.168]) by mx.google.com with ESMTPS id j11sm38183596anl.8.2012.01.23.13.08.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jan 2012 13:08:04 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 870EC3E0643; Mon, 23 Jan 2012 14:08:01 -0700 (MST) From: Grant Likely To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree-discuss@lists.ozlabs.org, Milton Miller , benh@kernel.crashing.org, Rob Herring Subject: [RFCv2 04/14] irq_domain: convert microblaze from irq_host to irq_domain Date: Mon, 23 Jan 2012 14:07:40 -0700 Message-Id: <1327352870-14687-5-git-send-email-grant.likely@secretlab.ca> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1327352870-14687-1-git-send-email-grant.likely@secretlab.ca> References: <1327352870-14687-1-git-send-email-grant.likely@secretlab.ca> X-Gm-Message-State: ALoCoQnb9DndrukDopFZo0H+n1EayxKhabAOcw5u84XbHZRtMhZCwp+t4kxICUO2RWNdm9zrlmw3 Cc: Michal Simek X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Trivial change, microblaze doesn't use irq remapping yet. Signed-off-by: Grant Likely Cc: Michal Simek --- arch/microblaze/include/asm/irq.h | 4 ++-- arch/microblaze/kernel/irq.c | 2 +- arch/microblaze/kernel/setup.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h index a175132..7798ad1 100644 --- a/arch/microblaze/include/asm/irq.h +++ b/arch/microblaze/include/asm/irq.h @@ -39,7 +39,7 @@ static inline void irq_dispose_mapping(unsigned int virq) return; } -struct irq_host; +struct irq_domain; /** * irq_create_mapping - Map a hardware interrupt into linux virq space @@ -51,7 +51,7 @@ struct irq_host; * If the sense/trigger is to be specified, set_irq_type() should be called * on the number returned from that call. */ -extern unsigned int irq_create_mapping(struct irq_host *host, +extern unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq); #endif /* _ASM_MICROBLAZE_IRQ_H */ diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index bbebcae..3f613df 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c @@ -51,7 +51,7 @@ next_irq: /* MS: There is no any advance mapping mechanism. We are using simple 32bit intc without any cascades or any connection that's why mapping is 1:1 */ -unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq) +unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq) { return hwirq + IRQ_OFFSET; } diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index d4fc1a9..208cd04 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -52,8 +52,6 @@ void __init setup_arch(char **cmdline_p) unflatten_device_tree(); - /* NOTE I think that this function is not necessary to call */ - /* irq_early_init(); */ setup_cpuinfo(); microblaze_cache_init();