lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 459/800] net: wwan: Fix WWAN config symbols
    Date
    [ Upstream commit 89212e160b81e778f829b89743570665810e3b13 ]

    There is not strong reason to have both WWAN and WWAN_CORE symbols,
    Let's build the WWAN core framework when WWAN is selected, in the
    same way as for other subsystems.

    This fixes issue with mhi_net selecting WWAN_CORE without WWAN and
    reported by kernel test robot:

    Kconfig warnings: (for reference only)
    WARNING: unmet direct dependencies detected for WWAN_CORE
    Depends on NETDEVICES && WWAN
    Selected by
    - MHI_NET && NETDEVICES && NET_CORE && MHI_BUS

    Fixes: 9a44c1cc6388 ("net: Add a WWAN subsystem")
    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/Kconfig | 1 +
    drivers/net/wwan/Kconfig | 15 ++++++---------
    drivers/net/wwan/Makefile | 2 +-
    3 files changed, 8 insertions(+), 10 deletions(-)

    diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
    index 74dc8e249faa..9b12a8e110f4 100644
    --- a/drivers/net/Kconfig
    +++ b/drivers/net/Kconfig
    @@ -431,6 +431,7 @@ config VSOCKMON
    config MHI_NET
    tristate "MHI network driver"
    depends on MHI_BUS
    + select WWAN
    help
    This is the network driver for MHI bus. It can be used with
    QCOM based WWAN modems (like SDX55). Say Y or M.
    diff --git a/drivers/net/wwan/Kconfig b/drivers/net/wwan/Kconfig
    index 7ad1920120bc..e9d8a1c25e43 100644
    --- a/drivers/net/wwan/Kconfig
    +++ b/drivers/net/wwan/Kconfig
    @@ -3,15 +3,9 @@
    # Wireless WAN device configuration
    #

    -menuconfig WWAN
    - bool "Wireless WAN"
    - help
    - This section contains Wireless WAN configuration for WWAN framework
    - and drivers.
    -
    -if WWAN
    +menu "Wireless WAN"

    -config WWAN_CORE
    +config WWAN
    tristate "WWAN Driver Core"
    help
    Say Y here if you want to use the WWAN driver core. This driver
    @@ -20,9 +14,10 @@ config WWAN_CORE
    To compile this driver as a module, choose M here: the module will be
    called wwan.

    +if WWAN
    +
    config MHI_WWAN_CTRL
    tristate "MHI WWAN control driver for QCOM-based PCIe modems"
    - select WWAN_CORE
    depends on MHI_BUS
    help
    MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem
    @@ -35,3 +30,5 @@ config MHI_WWAN_CTRL
    called mhi_wwan_ctrl.

    endif # WWAN
    +
    +endmenu
    diff --git a/drivers/net/wwan/Makefile b/drivers/net/wwan/Makefile
    index 556cd90958ca..289771a4f952 100644
    --- a/drivers/net/wwan/Makefile
    +++ b/drivers/net/wwan/Makefile
    @@ -3,7 +3,7 @@
    # Makefile for the Linux WWAN device drivers.
    #

    -obj-$(CONFIG_WWAN_CORE) += wwan.o
    +obj-$(CONFIG_WWAN) += wwan.o
    wwan-objs += wwan_core.o

    obj-$(CONFIG_MHI_WWAN_CTRL) += mhi_wwan_ctrl.o
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:2.303 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site