---

yaml --- r: 337522 b: refs/heads/master c: 7954006 h: refs/heads/master v: v3
git-mirror · Nov 1, 2012 · 1caf183 · 1caf183
1 parent a2f48da
commit 1caf183
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48d1db9311827b4639d34220da7736a04dcf02c9
+refs/heads/master: 7954006f0d5feb391efe3cc1b836b57fa9908ecf
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
@@ -231,8 +231,7 @@ struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
 int pci_card_alloc(struct pcilst_struct *amcc, int master);
 int i_pci_card_free(struct pcilst_struct *amcc);
 int i_pci_card_data(struct pcilst_struct *amcc,
-		    unsigned char *pci_bus, unsigned char *pci_slot,
-		    unsigned char *pci_func, resource_size_t * io_addr,
+		    resource_size_t *io_addr,
 		    unsigned int *irq);
 
 /****************************************************************************/
@@ -383,17 +382,13 @@ int i_pci_card_free(struct pcilst_struct *amcc)
 /****************************************************************************/
 /* return all card information for driver */
 int i_pci_card_data(struct pcilst_struct *amcc,
-		    unsigned char *pci_bus, unsigned char *pci_slot,
-		    unsigned char *pci_func, resource_size_t * io_addr,
+		    resource_size_t *io_addr,
 		    unsigned int *irq)
 {
 	int i;
 
 	if (!amcc)
 		return -1;
-	*pci_bus = amcc->pci_bus;
-	*pci_slot = amcc->pci_slot;
-	*pci_func = amcc->pci_func;
 	for (i = 0; i < 5; i++)
 		io_addr[i] = amcc->io_addr[i];
 	*irq = amcc->irq;

diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -95,7 +95,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	unsigned int irq;
 	resource_size_t iobase_a, iobase_main, iobase_addon, iobase_reserved;
 	struct pcilst_struct *card = NULL;
-	unsigned char pci_bus, pci_slot, pci_func;
 	int i_Dma = 0;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
@@ -122,8 +121,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	devpriv->allocated = 1;
 
-	if ((i_pci_card_data(card, &pci_bus, &pci_slot, &pci_func, &io_addr[0],
-				&irq)) < 0) {
+	if ((i_pci_card_data(card, &io_addr[0], &irq)) < 0) {
 		i_pci_card_free(card);
 		return -EIO;
 	}