Just the two remaining patches, with the only change being a would-be-
build fix to Arm code which cannot be compiled in the first place.

1: PCI: replace stray uses of PCI_{DEVFN,BDF}2()
2: PCI: replace "secondary" flavors of PCI_{DEVFN,BDF,SBDF}()

Jan