Commit 6910dadf authored by Simon Horman's avatar Simon Horman Committed by Greg Kroah-Hartman

Staging: DT3155: Use pci_get_device()

The use of pci_find_device() is deprecated.
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Cc: Scott Smedley <ss@aao.gov.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c22090fa
...@@ -963,7 +963,7 @@ static int find_PCI (void) ...@@ -963,7 +963,7 @@ static int find_PCI (void)
unsigned long base; unsigned long base;
unsigned char irq; unsigned char irq;
while ((pci_dev = pci_find_device while ((pci_dev = pci_get_device
(DT3155_VENDORID, DT3155_DEVICEID, pci_dev)) != NULL) (DT3155_VENDORID, DT3155_DEVICEID, pci_dev)) != NULL)
{ {
pci_index ++; pci_index ++;
...@@ -983,7 +983,7 @@ static int find_PCI (void) ...@@ -983,7 +983,7 @@ static int find_PCI (void)
"for %d devices\n" "for %d devices\n"
"DT3155: Please change MAXBOARDS in dt3155.h\n", "DT3155: Please change MAXBOARDS in dt3155.h\n",
pci_index, MAXBOARDS); pci_index, MAXBOARDS);
return DT_3155_FAILURE; goto err;
} }
/* Now, just go out and make sure that this/these device(s) is/are /* Now, just go out and make sure that this/these device(s) is/are
...@@ -992,7 +992,7 @@ static int find_PCI (void) ...@@ -992,7 +992,7 @@ static int find_PCI (void)
(u_int *) &base))) (u_int *) &base)))
{ {
printk("DT3155: Was not able to find device \n"); printk("DT3155: Was not able to find device \n");
return DT_3155_FAILURE; goto err;
} }
DT_3155_DEBUG_MSG("DT3155: Base address 0 for device is %lx \n", base); DT_3155_DEBUG_MSG("DT3155: Base address 0 for device is %lx \n", base);
...@@ -1007,13 +1007,13 @@ static int find_PCI (void) ...@@ -1007,13 +1007,13 @@ static int find_PCI (void)
if ( !dt3155_lbase[pci_index-1] ) if ( !dt3155_lbase[pci_index-1] )
{ {
printk("DT3155: Unable to remap control registers\n"); printk("DT3155: Unable to remap control registers\n");
return DT_3155_FAILURE; goto err;
} }
if ( (error = pci_read_config_byte( pci_dev, PCI_INTERRUPT_LINE, &irq)) ) if ( (error = pci_read_config_byte( pci_dev, PCI_INTERRUPT_LINE, &irq)) )
{ {
printk("DT3155: Was not able to find device \n"); printk("DT3155: Was not able to find device \n");
return DT_3155_FAILURE; goto err;
} }
DT_3155_DEBUG_MSG("DT3155: IRQ is %d \n",irq); DT_3155_DEBUG_MSG("DT3155: IRQ is %d \n",irq);
...@@ -1029,6 +1029,10 @@ static int find_PCI (void) ...@@ -1029,6 +1029,10 @@ static int find_PCI (void)
ndevices = pci_index; ndevices = pci_index;
return DT_3155_SUCCESS; return DT_3155_SUCCESS;
err:
pci_dev_put(pci_dev);
return DT_3155_FAILURE;
} }
u_long allocatorAddr = 0; u_long allocatorAddr = 0;
......
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