Another issue arises in the files drivers/infiniband/hw/hfi1/pcie.c and drivers/infiniband/hw/qib/qib_pcie.c, where the pci_error_handlers structure is defined in one file and used in another file. The structure definition references various functions that are static in the same file. Should I try to move those functions to the file containing the pci_driver structure? Or leave the functions where they are and remove the static annotation? thanks, julia