PCI: mediatek-gen3: select PCI_PWRCTRL_GENERIC correctly
Subsystems (3)
PATCH 1/1 PCI: mediatek-gen3: select PCI_PWRCTRL_GENERIC correctly
From: Arnd Bergmann <[email protected]>
The PCI_PWRCTRL_SLOT option was renamed to PCI_PWRCTRL_GENERIC, but a new user showed up using the old name, which caused a build failure when both conflicting patches are merged:
aarch64-linux-ld: drivers/pci/controller/pcie-mediatek-gen3.o: in function `mtk_pcie_remove':
pcie-mediatek-gen3.c:(.text+0x137c): undefined reference to `pci_pwrctrl_power_off_devices'
Use the correct symbol as intended originally.
--- drivers/pci/controller/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
@@ -222,7 +222,7 @@ config PCIE_MEDIATEK_GEN3 depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST depends on PCI_MSI select IRQ_MSI_LIB - select PCI_PWRCTRL_SLOT + select PCI_PWRCTRL_GENERIC help Adds support for PCIe Gen3 MAC controller for MediaTek SoCs. This PCIe controller is compatible with Gen3, Gen2 and Gen1 speed,
Signature · 1 line
2.39.5
Manivannan Sadhasivam
maintainerQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
PCI_PWRCTRL_SLOToption was renamed toPCI_PWRCTRL_GENERIC, but a new user showed up using the old name, which caused a build failure when both conflicting patches are merged:
Quoted 8 lines
aarch64-linux-ld:
drivers/pci/controller/pcie-mediatek-gen3.o: in function `mtk_pcie_remove':
pcie-mediatek-gen3.c:(.text+0x137c): undefined reference to `pci_pwrctrl_power_off_devices'Use the correct symbol as intended originally.
Fixes ff124bbbca1d ("PCI/pwrctrl: generic: Rename pci-pwrctrl-slot as generic")Fixes 073a7e1b7bcc ("PCI: mediatek-gen3: Integrate new pwrctrl API")Signed-off-by Arnd Bergmann <[email protected]>
Bjorn, should I squash this fix with 073a7e1b7bcc so that pci/next will build properly?
- Mani
Quoted 20 lines
--- drivers/pci/controller/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/controller/Kconfig +1
-1@@ -222,7 +222,7 @@ config PCIE_MEDIATEK_GEN3 depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST depends on PCI_MSI select IRQ_MSI_LIB - select PCI_PWRCTRL_SLOT + select PCI_PWRCTRL_GENERIC help Adds support for PCIe Gen3 MAC controller for MediaTek SoCs. This PCIe controller is compatible with Gen3, Gen2 and Gen1 speed,Signature · 1 line
2.39.5
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 10 lines · Manivannan Sadhasivam
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
PCI_PWRCTRL_SLOToption was renamed toPCI_PWRCTRL_GENERIC, but a new user showed up using the old name, which caused a build failure when both conflicting patches are merged:aarch64-linux-ld:
drivers/pci/controller/pcie-mediatek-gen3.o: in function `mtk_pcie_remove':
pcie-mediatek-gen3.c:(.text+0x137c): undefined reference to `pci_pwrctrl_power_off_devices'
Quoted 8 lines
Quoted 5 lines
Use the correct symbol as intended originally.
Fixes ff124bbbca1d ("PCI/pwrctrl: generic: Rename pci-pwrctrl-slot as generic")Fixes 073a7e1b7bcc ("PCI: mediatek-gen3: Integrate new pwrctrl API")Signed-off-by Arnd Bergmann <[email protected]>Bjorn, should I squash this fix with
073a7e1b7bccso that pci/next will build properly?
If you squash this into 073a7e1b7bcc, I think the 0-day bot will comlain about the resulting pci/controller/mediatek-gen3 branch because it doesn't include ff124bbbca1d.
I can resolve it by hand when merging pci/controller/mediatek-gen3 into pci/next.
Quoted 23 lines
Quoted 20 lines
--- drivers/pci/controller/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/controller/Kconfig +1
-1@@ -222,7 +222,7 @@ config PCIE_MEDIATEK_GEN3 depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST depends on PCI_MSI select IRQ_MSI_LIB - select PCI_PWRCTRL_SLOT + select PCI_PWRCTRL_GENERIC help Adds support for PCIe Gen3 MAC controller for MediaTek SoCs. This PCIe controller is compatible with Gen3, Gen2 and Gen1 speed,Signature · 1 line
2.39.5Signature · 1 line
மணிவண்ணன் சதாசிவம்