via* : switch to pci_get_device refcounted PCI API
PATCH 1/1 via* : switch to pci_get_device refcounted PCI API
If we can clean up these remainders we can finally delete pci_find_*
Signed-off-by Alan Cox <[email protected]>
drivers/macintosh/via-pmu68k.c +3 -3
@@ -843,7 +843,7 @@struct pci_save *ps; npci =0 ; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) ++npci; n_pbook_pci_saves = npci;if (npci ==0 )
@@ -854,7 +854,7 @@return ; pd =NULL ; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) {pci_read_config_word (pd,PCI_COMMAND , &ps->command);pci_read_config_word (pd,PCI_CACHE_LINE_SIZE , &ps->cache_lat);pci_read_config_word (pd,PCI_INTERRUPT_LINE , &ps->intr);
@@ -871,7 +871,7 @@struct pci_dev *pd =NULL ;int j; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) {if (ps->command ==0 )continue ;pci_read_config_word (pd,PCI_COMMAND , &cmd);
drivers/macintosh/via-pmu.c +9 -5
@@ -1827,7 +1827,7 @@struct pci_dev *pd =NULL ; npci =0 ; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { ++npci; }if (npci ==0 )
@@ -1857,9 +1857,11 @@if (ps ==NULL )return ; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { -if (npci-- ==0 ) +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { +if (npci-- ==0 ) { +pci_dev_put (pd);return ; + }#ifndef HACKED_PCI_SAVE pci_read_config_word (pd,PCI_COMMAND , &ps->command);pci_read_config_word (pd,PCI_CACHE_LINE_SIZE , &ps->cache_lat);
@@ -1887,11 +1889,13 @@int npci = pbook_npci_saves;int j; -while ((pd =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) { +while ((pd =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pd)) !=NULL ) {#ifdef HACKED_PCI_SAVE int i; -if (npci-- ==0 ) +if (npci-- ==0 ) { +pci_dev_put (pd);return ; + } ps++;for (i=2 ;i<16 ;i++)pci_write_config_dword (pd, i<<4 , ps->config[i]);
Quoted 3 lines · Alan Cox
If we can clean up these remainders we can finally delete pci_find_*
Signed-off-by Alan Cox <[email protected]>
Note that I should probably revisit the via-pmu bits one of these days, I don't think I need that save/restore of the config space of all PCI devices anymore.
Cheers,
Ben.