Skip to content

Commit

Permalink
staging: comedi: addi-data: remove 'irq' from the card data
Browse files Browse the repository at this point in the history
This information can be found when needed in i_ADDI_Attach() by
using the pci_dev pointer.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent b0d1168 commit ade6c03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ struct pcilst_struct {
unsigned char pci_bus;
unsigned char pci_slot;
unsigned char pci_func;
unsigned int irq;
};

/* ptr to root list of all amcc devices */
Expand Down Expand Up @@ -259,8 +258,6 @@ void v_pci_card_list_init(unsigned short pci_vendor)
amcc->pci_bus = pcidev->bus->number;
amcc->pci_slot = PCI_SLOT(pcidev->devfn);
amcc->pci_func = PCI_FUNC(pcidev->devfn);
amcc->irq = pcidev->irq;

}
}
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* ## */

if (card->irq > 0) {
ret = request_irq(card->irq, v_ADDI_Interrupt, IRQF_SHARED,
if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
this_board->pc_DriverName, dev);
if (ret == 0)
dev->irq = card->irq;
dev->irq = pcidev->irq;
}

/* Read eepeom and fill addi_board Structure */
Expand Down

0 comments on commit ade6c03

Please sign in to comment.