]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in
authorWei Liu <wei.liu@kernel.org>
Wed, 11 Dec 2019 17:45:11 +0000 (17:45 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:38:14 +0000 (08:38 +0100)
commit196f61f09f698227e1bef12f66c8b17c1746201d
tree7277ddbdba312390a28ebf5f619aae8dba3aee2e
parent20062ea22130c959a7954a86e0839022c36d9284
PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in

[ Upstream commit 574f29036fce385e28617547955dd6911d375025 ]

Previously quirk_paxc_bridge() was applied when the iproc driver was
built-in, but not when it was compiled as a module.

This happened because it was under #ifdef CONFIG_PCIE_IPROC_PLATFORM:
PCIE_IPROC_PLATFORM=y causes CONFIG_PCIE_IPROC_PLATFORM to be defined, but
PCIE_IPROC_PLATFORM=m causes CONFIG_PCIE_IPROC_PLATFORM_MODULE to be
defined.

Move quirk_paxc_bridge() to pcie-iproc.c and drop the #ifdef so the quirk
is always applied, whether iproc is built-in or a module.

[bhelgaas: commit log, move to pcie-iproc.c, not pcie-iproc-platform.c]
Link: https://lore.kernel.org/r/20191211174511.89713-1-wei.liu@kernel.org
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/controller/pcie-iproc.c
drivers/pci/quirks.c