From patchwork Tue Dec 1 20:48:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 39931 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 93164100A0A for ; Wed, 2 Dec 2009 07:48:35 +1100 (EST) Received: from mail-ew0-f215.google.com (mail-ew0-f215.google.com [209.85.219.215]) by ozlabs.org (Postfix) with ESMTP id AE20C1007D2 for ; Wed, 2 Dec 2009 07:48:27 +1100 (EST) Received: by ewy7 with SMTP id 7so6199057ewy.8 for ; Tue, 01 Dec 2009 12:48:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:date:message-id:x-mailer:to; bh=CQS/uPzhzHfY49Iewcnx2964Ve+cNtwAds0UFM+46CE=; b=cwc5khT7aF/W++LKCMryFy2tU0ltlB5uRwCO4SHTgr0Bqu3YrkWzoRPa92RdWjeD+H oWgLYHCxvWJQ9uHWno4tb+0xf7YQhIbCUByZjOlRb3ykDEWjOPt7DBoDZbMy1Kl0GK+I YUYH7Wf/Z353OwRGiv+gyYuHAXK1hrES2r5Ho= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=b9/XLV4Ee3RiwlSA3qEK859N33LesYk9gQVjC21857RiEODXxgjcB5qUHrHq4rwLJC AqVCroZaOZkKWCiOCpMnmXAUcM9agw/ezVbcd10NN13TJsdl+nyFkNXrQEgCMEJi1XHg s7xmXf5PEU7nLtZ+dVDKsSNjc5VPB0DJEOlA8= Received: by 10.213.96.6 with SMTP id f6mr3236954ebn.81.1259700501895; Tue, 01 Dec 2009 12:48:21 -0800 (PST) Received: from macbook.be.48ers.dk (ip-81-11-185-23.dsl.scarlet.be [81.11.185.23]) by mx.google.com with ESMTPS id 16sm297537ewy.6.2009.12.01.12.48.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 01 Dec 2009 12:48:21 -0800 (PST) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id 1053DC3A1D; Tue, 1 Dec 2009 21:48:20 +0100 (CET) From: Peter Korsgaard To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/3] show_interrupts: use irq_chip::name if available Date: Tue, 1 Dec 2009 21:48:12 +0100 Message-Id: <1259700494-17869-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.6.5 To: Benjamin Herrenschmidt X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org struct irq_chip::typename is going away (replaced by name). Use name if set instead of typename in show_interrupt to make ease transition. Signed-off-by: Peter Korsgaard --- arch/powerpc/kernel/irq.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index e5d1211..33e1130 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -203,7 +203,8 @@ int show_interrupts(struct seq_file *p, void *v) seq_printf(p, "%10u ", kstat_irqs(i)); #endif /* CONFIG_SMP */ if (desc->chip) - seq_printf(p, " %s ", desc->chip->typename); + seq_printf(p, " %s ", desc->chip->name ? + desc->chip->name : desc->chip->typename); else seq_puts(p, " None "); seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge ");