PCI: Xtensa: convert pcibios_set_master() to a non-inlined function (9cdce18d) · Commits · e / devices / android_kernel_fairphone_FP5

This patch converts Xtensa's architecture-specific 'pcibios_set_master()' routine to a non-inlined function. This will allow follow on patches to create a generic 'pcibios_set_master()' function using the '__weak' attribute which can be used by all architectures as a default which, if necessary, can then be over- ridden by architecture-specific code. Converting 'pci_bios_set_master()' to a non-inlined function will allow Xtensa's 'pcibios_set_master()' implementation to remain architecture-specific after the generic version is introduced and thus, not change current behavior. No functional change. Signed-off-by:

Myron Stowe <myron.stowe@redhat.com> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

arch/xtensa/include/asm/pci.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -22,11 +22,6 @@

	extern struct pci_controller* pcibios_alloc_controller(void);		extern struct pci_controller* pcibios_alloc_controller(void);

	static inline void pcibios_set_master(struct pci_dev *dev)
	{
	/* No special bus mastering setup handling */
	}

	static inline void pcibios_penalize_isa_irq(int irq)		static inline void pcibios_penalize_isa_irq(int irq)
	{		{
	/* We don't do dynamic PCI IRQ allocation */		/* We don't do dynamic PCI IRQ allocation */

arch/xtensa/kernel/pci.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -227,6 +227,11 @@ char __init pcibios_setup(char str)
	return str;		return str;
	}		}

			void pcibios_set_master(struct pci_dev *dev)
			{
			/* No special bus mastering setup handling */
			}

	/* the next one is stolen from the alpha port... */		/* the next one is stolen from the alpha port... */

	void __init		void __init