ip2: use newer pci_get functions
PATCH 1/1 ip2: use newer pci_get functions
This is one of a series of patches I plan to gradually trickle into the tree which eliminates almost all remaining use of pci_find_* and lets me build a pci_find_* free kernel for all but some obscure ISDN and SCSI drivers. This is important as all pci_find_* users are not hotplug safe
- even if they are not the device being plugged.
Signed-off-by Alan Cox <[email protected]>
drivers/char/ip2/ip2main.c +8 -3
@@ -436,6 +436,7 @@#ifdef CONFIG_PCI if (ip2config.type[i] ==PCI && ip2config.pci_dev[i]) {pci_disable_device (ip2config.pci_dev[i]); +pci_dev_put (ip2config.pci_dev[i]); ip2config.pci_dev[i] =NULL ; }#endif
@@ -505,6 +506,7 @@static int loaded;i2eBordStrPtr pB =NULL ;int rc =-1 ; +static struct pci_dev *pci_dev_i =NULL ;ip2trace (ITRC_NO_PORT ,ITRC_INIT ,ITRC_ENTER ,0 );
@@ -566,6 +568,7 @@/* Initialise all the boards we can find (up to the maximum). */ for ( i =0 ; i <IP2_MAX_BOARDS ; ++i ) { +switch ( ip2config.addr[i] ) {case 0 :/* skip this slot even if card is present */ break ;
@@ -588,8 +591,7 @@case PCI :#ifdef CONFIG_PCI { -struct pci_dev *pci_dev_i =NULL ; - pci_dev_i =pci_find_device (PCI_VENDOR_ID_COMPUTONE , + pci_dev_i =pci_get_device (PCI_VENDOR_ID_COMPUTONE ,PCI_DEVICE_ID_COMPUTONE_IP2EX , pci_dev_i);if (pci_dev_i !=NULL ) {unsigned int addr;
@@ -600,7 +602,7 @@break ; } ip2config.type[i] =PCI ; - ip2config.pci_dev[i] = pci_dev_i; + ip2config.pci_dev[i] =pci_dev_get (pci_dev_i); status =pci_read_config_dword (pci_dev_i,PCI_BASE_ADDRESS_1 , &addr);if ( addr &1 ) {
@@ -641,6 +643,9 @@break ; }/* switch */ }/* for */ +if (pci_dev_i) +pci_dev_put (pci_dev_i); +for ( i =0 ; i <IP2_MAX_BOARDS ; ++i ) {if ( ip2config.addr[i] ) { pB =kmalloc (sizeof (i2eBordStr),GFP_KERNEL );
drivers/char/ip2/ip2main.c line 574
Quoted 8 lines · Alan Cox
drivers/char/ip2/ip2main.c +1
-0@@ -566,6 +568,7 @@/* Initialise all the boards we can find (up to the maximum). */ for ( i =0 ; i <IP2_MAX_BOARDS ; ++i ) { +switch ( ip2config.addr[i] ) {case 0 :/* skip this slot even if card is present */ break ;
?!?