Commit ade6c03d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi-data: remove 'irq' from the card data

This information can be found when needed in i_ADDI_Attach() by
using the pci_dev pointer.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0d11687
...@@ -201,7 +201,6 @@ struct pcilst_struct { ...@@ -201,7 +201,6 @@ struct pcilst_struct {
unsigned char pci_bus; unsigned char pci_bus;
unsigned char pci_slot; unsigned char pci_slot;
unsigned char pci_func; unsigned char pci_func;
unsigned int irq;
}; };
/* ptr to root list of all amcc devices */ /* ptr to root list of all amcc devices */
...@@ -259,8 +258,6 @@ void v_pci_card_list_init(unsigned short pci_vendor) ...@@ -259,8 +258,6 @@ void v_pci_card_list_init(unsigned short pci_vendor)
amcc->pci_bus = pcidev->bus->number; amcc->pci_bus = pcidev->bus->number;
amcc->pci_slot = PCI_SLOT(pcidev->devfn); amcc->pci_slot = PCI_SLOT(pcidev->devfn);
amcc->pci_func = PCI_FUNC(pcidev->devfn); amcc->pci_func = PCI_FUNC(pcidev->devfn);
amcc->irq = pcidev->irq;
} }
} }
} }
......
...@@ -177,11 +177,11 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -177,11 +177,11 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* ## */ /* ## */
if (card->irq > 0) { if (pcidev->irq > 0) {
ret = request_irq(card->irq, v_ADDI_Interrupt, IRQF_SHARED, ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
this_board->pc_DriverName, dev); this_board->pc_DriverName, dev);
if (ret == 0) if (ret == 0)
dev->irq = card->irq; dev->irq = pcidev->irq;
} }
/* Read eepeom and fill addi_board Structure */ /* Read eepeom and fill addi_board Structure */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment