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 208/717] soundwire: qcom: Fix build failure when slimbus is module
    Date
    From: Vinod Koul <vkoul@kernel.org>

    [ Upstream commit 47edc0104c61d609b0898a302267b7269d87a6af ]

    Commit 5bd773242f75 ("soundwire: qcom: avoid dependency on
    CONFIG_SLIMBUS") removed hard dependency on Slimbus for qcom driver but
    it results in build failure when: CONFIG_SOUNDWIRE_QCOM=y
    CONFIG_SLIMBUS=m

    drivers/soundwire/qcom.o: In function `qcom_swrm_probe':
    qcom.c:(.text+0xf44): undefined reference to `slimbus_bus'

    Fix this by using IS_REACHABLE() in driver which is recommended to be
    used with imply.

    Fixes: 5bd773242f75 ("soundwire: qcom: avoid dependency on CONFIG_SLIMBUS")
    Reported-by: kernel test robot <lkp@intel.com>
    Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
    Link: https://lore.kernel.org/r/20201125055155.GD8403@vkoul-mobl
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soundwire/qcom.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
    index fbca4ebf63e92..6d22df01f3547 100644
    --- a/drivers/soundwire/qcom.c
    +++ b/drivers/soundwire/qcom.c
    @@ -799,7 +799,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
    data = of_device_get_match_data(dev);
    ctrl->rows_index = sdw_find_row_index(data->default_rows);
    ctrl->cols_index = sdw_find_col_index(data->default_cols);
    -#if IS_ENABLED(CONFIG_SLIMBUS)
    +#if IS_REACHABLE(CONFIG_SLIMBUS)
    if (dev->parent->bus == &slimbus_bus) {
    #else
    if (false) {
    --
    2.27.0


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