From patchwork Sat Jan 29 08:08:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 80929 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F2A41007D3 for ; Sat, 29 Jan 2011 19:08:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786Ab1A2II2 (ORCPT ); Sat, 29 Jan 2011 03:08:28 -0500 Received: from pfepb.post.tele.dk ([195.41.46.236]:50774 "EHLO pfepb.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708Ab1A2II0 (ORCPT ); Sat, 29 Jan 2011 03:08:26 -0500 Received: from localhost.localdomain (x1-6-30-46-9a-75-8a-52.k1039.webspeed.dk [93.167.48.205]) by pfepb.post.tele.dk (Postfix) with ESMTP id 495DCF8401C; Sat, 29 Jan 2011 09:08:25 +0100 (CET) From: Sam Ravnborg To: "David S. Miller" Cc: sparclinux , Sam Ravnborg Subject: [PATCH 6/8] sparc32, sun4d: drop unused code in sun4d_distribute_irqs() Date: Sat, 29 Jan 2011 09:08:22 +0100 Message-Id: <1296288504-15933-6-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <20110129080712.GA15903@merkur.ravnborg.org> References: <20110129080712.GA15903@merkur.ravnborg.org> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The preprocessor symbol was not defined and the code was therefore not in use. Signed-off-by: Sam Ravnborg --- arch/sparc/kernel/sun4d_irq.c | 47 ----------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-) diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index 5fc4c22..b2e3fbf 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c @@ -38,13 +38,6 @@ * have interrupts pending for that SBUS interrupt level. */ -/* - * If you trust current SCSI layer to handle different - * SCSI IRQs, enable this. - * I don't trust it... -jj - */ -/* #define DISTRIBUTE_IRQS */ - struct sun4d_timer_regs { u32 l10_timer_limit; u32 l10_cur_countx; @@ -412,45 +405,6 @@ void __init sun4d_distribute_irqs(void) { struct device_node *dp; -#ifdef DISTRIBUTE_IRQS - cpumask_t sbus_serving_map; - - sbus_serving_map = cpu_present_map; - for_each_node_by_name(dp, "sbi") { - int board = of_getintprop_default(dp, "board#", 0); - - if ((board * 2) == boot_cpu_id && cpu_isset(board * 2 + 1, cpu_present_map)) - sbus_tid[board] = (board * 2 + 1); - else if (cpu_isset(board * 2, cpu_present_map)) - sbus_tid[board] = (board * 2); - else if (cpu_isset(board * 2 + 1, cpu_present_map)) - sbus_tid[board] = (board * 2 + 1); - else - sbus_tid[board] = 0xff; - if (sbus_tid[board] != 0xff) - cpu_clear(sbus_tid[board], sbus_serving_map); - } - for_each_node_by_name(dp, "sbi") { - int board = of_getintprop_default(dp, "board#", 0); - if (sbus_tid[board] == 0xff) { - int i = 31; - - if (cpus_empty(sbus_serving_map)) - sbus_serving_map = cpu_present_map; - while (cpu_isset(i, sbus_serving_map)) - i--; - sbus_tid[board] = i; - cpu_clear(i, sbus_serving_map); - } - } - for_each_node_by_name(dp, "sbi") { - int devid = of_getintprop_default(dp, "device-id", 0); - int board = of_getintprop_default(dp, "board#", 0); - printk(KERN_ERR "sbus%d IRQs directed to CPU%d\n", - board, sbus_tid[board]); - set_sbi_tid(devid, sbus_tid[board] << 3); - } -#else int cpuid = cpu_logical_map(1); if (cpuid == -1) @@ -462,7 +416,6 @@ void __init sun4d_distribute_irqs(void) set_sbi_tid(devid, cpuid << 3); } printk(KERN_ERR "All sbus IRQs directed to CPU%d\n", cpuid); -#endif } #endif