staging: comedi: me4000: use dev->irq to save the irq number

Use the irq variable provided in the comedi_device to save the
irq number and remove it from the private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 418a6799cbed0d1003799c1f864affbe5bec0981..a041054c953c99b2ccb9f80e01abcedc7a471121 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/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/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 042ec4c36a8407fc197b964ab3e4a01d7f200e8f..57b02e1222525c3ee6601664cadda595c4210c05 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/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];
 };