From 986b76daacf67a53b9e9fafd00794e0ae1712951 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:45:26 -0700
Subject: [PATCH] --- yaml --- r: 324962 b: refs/heads/master c:
 109daa79807a47dc56d7533a7fdcd0dc72c862b2 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 8 ++++----
 trunk/drivers/staging/comedi/drivers/me4000.h | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7fd22278aa14..10a8c374eedf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d7ccb770b9b231c177bb7477a89cea9682d61a
+refs/heads/master: 109daa79807a47dc56d7533a7fdcd0dc72c862b2
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index 418a6799cbed..a041054c953c 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -332,7 +332,7 @@ static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 	/* spin_lock_init(&info->ai_ctrl_lock); */
 
 	/* Get the irq assigned to the board */
-	info->irq = pci_dev_p->irq;
+	dev->irq = pci_dev_p->irq;
 
 	return 0;
 }
@@ -1266,7 +1266,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
 	s->async->events = 0;
 
 	/* Check if irq number is right */
-	if (irq != info->irq) {
+	if (irq != dev->irq) {
 		printk(KERN_ERR
 		       "comedi%d: me4000: me4000_ai_isr(): "
 		       "Incorrect interrupt num: %d\n", dev->minor, irq);
@@ -1876,8 +1876,8 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		s->range_table = &me4000_ai_range;
 		s->insn_read = me4000_ai_insn_read;
 
-		if (info->irq > 0) {
-			if (request_irq(info->irq, me4000_ai_isr,
+		if (dev->irq > 0) {
+			if (request_irq(dev->irq, me4000_ai_isr,
 					IRQF_SHARED, "ME-4000", dev)) {
 				printk
 				    ("comedi%d: me4000: me4000_attach(): "
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
index 042ec4c36a84..57b02e122252 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.h
+++ b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -224,8 +224,6 @@ struct me4000_info {
 
 	struct pci_dev *pci_dev_p;	/*  General PCI information */
 
-	unsigned int irq;	/*  IRQ assigned from the PCI BIOS */
-
 	unsigned int ao_readback[4];
 };