iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: wwan: Fix WWAN config symbols

Browse Source 
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>
This commit is contained in:
Loic Poulain 2021-06-14 18:56:36 +02:00 committed by David S. Miller
parent ec13357263
commit 89212e160b
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Kconfig
View File

@ -431,7 +431,7 @@ config VSOCKMON
config MHI_NET config MHI_NET
tristate "MHI network driver" tristate "MHI network driver"
depends on MHI_BUS depends on MHI_BUS
select WWAN_CORE select WWAN
help help
This is the network driver for MHI bus. It can be used with This is the network driver for MHI bus. It can be used with
QCOM based WWAN modems (like SDX55). Say Y or M. QCOM based WWAN modems (like SDX55). Say Y or M.

17
drivers/net/wwan/Kconfig
View File

@ -3,15 +3,9 @@
# Wireless WAN device configuration # Wireless WAN device configuration
# #
menuconfig WWAN menu "Wireless WAN"
bool "Wireless WAN"
help
This section contains Wireless WAN configuration for WWAN framework
and drivers.
if WWAN config WWAN
config WWAN_CORE
tristate "WWAN Driver Core" tristate "WWAN Driver Core"
help help
Say Y here if you want to use the WWAN driver core. This driver 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 To compile this driver as a module, choose M here: the module will be
called wwan. called wwan.
if WWAN
config WWAN_HWSIM config WWAN_HWSIM
tristate "Simulated WWAN device" tristate "Simulated WWAN device"
depends on WWAN_CORE
help help
This driver is a developer testing tool that can be used to test WWAN This driver is a developer testing tool that can be used to test WWAN
framework. framework.
@ -32,7 +27,6 @@ config WWAN_HWSIM
config MHI_WWAN_CTRL config MHI_WWAN_CTRL
tristate "MHI WWAN control driver for QCOM-based PCIe modems" tristate "MHI WWAN control driver for QCOM-based PCIe modems"
select WWAN_CORE
depends on MHI_BUS depends on MHI_BUS
help help
MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem
@ -46,7 +40,6 @@ config MHI_WWAN_CTRL
config IOSM config IOSM
tristate "IOSM Driver for Intel M.2 WWAN Device" tristate "IOSM Driver for Intel M.2 WWAN Device"
select WWAN_CORE
depends on INTEL_IOMMU depends on INTEL_IOMMU
help help
This driver enables Intel M.2 WWAN Device communication. This driver enables Intel M.2 WWAN Device communication.
@ -57,3 +50,5 @@ config IOSM
If unsure, say N. If unsure, say N.
endif # WWAN endif # WWAN
endmenu

2
drivers/net/wwan/Makefile
View File

@ -3,7 +3,7 @@
# Makefile for the Linux WWAN device drivers. # Makefile for the Linux WWAN device drivers.
# #
obj-$(CONFIG_WWAN_CORE) += wwan.o obj-$(CONFIG_WWAN) += wwan.o
wwan-objs += wwan_core.o wwan-objs += wwan_core.o
obj-$(CONFIG_WWAN_HWSIM) += wwan_hwsim.o obj-$(CONFIG_WWAN_HWSIM) += wwan_hwsim.o