From patchwork Sun Feb  6 20:46:03 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Thomas Gleixner <tglx@linutronix.de>
X-Patchwork-Id: 536101
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p16KkBTS022225
	for <patchwork-parisc@patchwork.kernel.org>;
	Sun, 6 Feb 2011 20:46:21 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753896Ab1BFUqV (ORCPT
	<rfc822;patchwork-parisc@patchwork.kernel.org>);
	Sun, 6 Feb 2011 15:46:21 -0500
Received: from www.tglx.de ([62.245.132.106]:42317 "EHLO www.tglx.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754025Ab1BFUqV (ORCPT <rfc822;linux-parisc@vger.kernel.org>);
	Sun, 6 Feb 2011 15:46:21 -0500
Received: from localhost6.localdomain6 (www.tglx.de [127.0.0.1])
	by www.tglx.de (8.13.8/8.13.8/TGLX-2007100201) with ESMTP id
	p16Kk3Bf008204; Sun, 6 Feb 2011 21:46:03 +0100
Message-Id: <20110206204510.925278920@linutronix.de>
User-Agent: quilt/0.48-1
Date: Sun, 06 Feb 2011 20:46:03 -0000
From: Thomas Gleixner <tglx@linutronix.de>
To: linux-parisc@vger.kernel.org
Cc: Kyle McMartin <kyle@redhat.com>,
	"James E.J. Bottomley" <jejb@parisc-linux.org>
Subject: [patch 6/8] parisc: Convert superio irq_chip to new functions
References: <20110206204411.109238550@linutronix.de>
Content-Disposition: inline; filename=parisc-convert-superio.patch
X-Virus-Scanned: clamav-milter 0.95.3 at www.tglx.de
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,AWL
	autolearn=failed version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on www.tglx.de
Sender: linux-parisc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Sun, 06 Feb 2011 20:46:21 +0000 (UTC)


Index: linux-next/drivers/parisc/superio.c
===================================================================
--- linux-next.orig/drivers/parisc/superio.c
+++ linux-next/drivers/parisc/superio.c
@@ -286,8 +286,9 @@ superio_init(struct pci_dev *pcidev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init);
 
-static void superio_mask_irq(unsigned int irq)
+static void superio_mask_irq(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
 	u8 r8;
 
 	if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -303,8 +304,9 @@ static void superio_mask_irq(unsigned in
 	outb (r8,IC_PIC1+1);
 }
 
-static void superio_unmask_irq(unsigned int irq)
+static void superio_unmask_irq(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
 	u8 r8;
 
 	if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -320,9 +322,9 @@ static void superio_unmask_irq(unsigned 
 }
 
 static struct irq_chip superio_interrupt_type = {
-	.name	=	SUPERIO,
-	.unmask	=	superio_unmask_irq,
-	.mask	=	superio_mask_irq,
+	.name		=	SUPERIO,
+	.irq_unmask	=	superio_unmask_irq,
+	.irq_mask	=	superio_mask_irq,
 };
 
 #ifdef DEBUG_SUPERIO_INIT