lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2012-10-31 16:56:42 -07:00
committed by Greg Kroah-Hartman
parent b0d116876c
commit ade6c03da5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
View File

@@ -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 */
@@ -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;
}
}
}

6
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@@ -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 */