Эх сурвалжийг харах

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten 12 жил өмнө
parent
commit
ade6c03da5

+ 0 - 3
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h

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

+ 3 - 3
drivers/staging/comedi/drivers/addi-data/addi_common.c

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