alpha/PCI: move fixup hooks from __init to __devinit (8ff255af) · Commits · 戴 / test

The fixups are executed once the pci-device is found which is during boot process so __init seems fine as long as the platform does not support hotplug. However it is possible to remove the PCI bus at run time and have it rediscovered again via "echo 1 > /sys/bus/pci/rescan" and this will call the fixups again. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Signed-off-by:

Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com>

arch/alpha/kernel/pci.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -59,15 +59,13 @@ struct pci_controller *pci_isa_hose;
		* Quirks.
		*/

		static void __init
		quirk_isa_bridge(struct pci_dev *dev)
		static void __devinit quirk_isa_bridge(struct pci_dev *dev)
		{
		dev->class = PCI_CLASS_BRIDGE_ISA << 8;
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);

		static void __init
		quirk_cypress(struct pci_dev *dev)
		static void __devinit quirk_cypress(struct pci_dev *dev)
		{
		/* The Notorious Cy82C693 chip. */

		@@ -106,8 +104,7 @@ quirk_cypress(struct pci_dev *dev)
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress);

		/* Called for each device after PCI setup is done. */
		static void __init
		pcibios_fixup_final(struct pci_dev *dev)
		static void __devinit pcibios_fixup_final(struct pci_dev *dev)
		{
		unsigned int class = dev->class >> 8;

Admin message