And remember to decrement the count after remove() is called.

  
This will let include/linux/pci.h get smaller, and is what I should 
have done in the first place 2 years ago...

No one is using them outside the pci core.

[PATCH] PCI: make pci_setup_device(), pci_alloc_primary_bus() and pci_alloc_primary_bus_parented() static

No one is calling these functions.