lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 399/717] remoteproc/mtk_scp: surround DT device IDs with CONFIG_OF
    Date
    From: Alexandre Courbot <acourbot@chromium.org>

    [ Upstream commit e59aef4edc45133ccb10b8e962cb74dcf1e3240b ]

    Now that this driver can be compiled with COMPILE_TEST, we have no
    guarantee that CONFIG_OF will also be defined. When that happens, a
    warning about mtk_scp_of_match being defined but unused will be reported
    so make sure this variable is only defined if of_match_ptr() actually
    uses it.

    Fixes: cbd2dca74926c0e4610c40923cc786b732c9e8ef remoteproc: scp: add COMPILE_TEST dependency
    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
    Link: https://lore.kernel.org/r/20201102074007.299222-1-acourbot@chromium.org
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/mtk_scp.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
    index 577cbd5d421ec..f74f22d4d1ffc 100644
    --- a/drivers/remoteproc/mtk_scp.c
    +++ b/drivers/remoteproc/mtk_scp.c
    @@ -772,12 +772,14 @@ static const struct mtk_scp_of_data mt8192_of_data = {
    .host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT,
    };

    +#if defined(CONFIG_OF)
    static const struct of_device_id mtk_scp_of_match[] = {
    { .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data },
    { .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
    {},
    };
    MODULE_DEVICE_TABLE(of, mtk_scp_of_match);
    +#endif

    static struct platform_driver mtk_scp_driver = {
    .probe = scp_probe,
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:7.335 / U:1.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site