Re: [PATCH 5.10] PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}()

Uwe Kleine-König
2023-11-29T09:48:06Z

[-- Attachment #1: Type: text/plain, Size: 2160 bytes --]

On Tue, Nov 28, 2023 at 05:37:00PM -0700, Nathan Chancellor wrote:
> This commit has no upstream equivalent.
>
> After commit db5ebaeb8fda ("PCI: keystone: Don't discard .probe()
> callback") in 5.10, there are two modpost warnings when building with

As with the 5.4 patch:

s/5.10/5.10.202/

> clang:
>
> WARNING: modpost: vmlinux.o(.text+0x5aa6dc): Section mismatch in reference from the function ks_pcie_probe() to the function .init.text:ks_pcie_add_pcie_port()
> The function ks_pcie_probe() references
> the function __init ks_pcie_add_pcie_port().
> This is often because ks_pcie_probe lacks a __init
> annotation or the annotation of ks_pcie_add_pcie_port is wrong.
>
> WARNING: modpost: vmlinux.o(.text+0x5aa6f4): Section mismatch in reference from the function ks_pcie_probe() to the function .init.text:ks_pcie_add_pcie_ep()
> The function ks_pcie_probe() references
> the function __init ks_pcie_add_pcie_ep().
> This is often because ks_pcie_probe lacks a __init
> annotation or the annotation of ks_pcie_add_pcie_ep is wrong.
>
> ks_pcie_add_pcie_ep() was removed in upstream commit a0fd361db8e5 ("PCI:
> dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common
> code") and ks_pcie_add_pcie_port() was removed in upstream
> commit 60f5b73fa0f2 ("PCI: dwc: Remove unnecessary wrappers around
> dw_pcie_host_init()"), both of which happened before upstream
> commit 7994db905c0f ("PCI: keystone: Don't discard .probe() callback").
>
> As neither of these removal changes are really suitable for stable, just
> remove __init from these functions in stable, as it is no longer a
> correct annotation after dropping __init from ks_pcie_probe().
>
> Fixes: db5ebaeb8fda ("PCI: keystone: Don't discard .probe() callback")
> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]