[PATCH] net: qrtr: fix build problems

Path	csiph.com!feeder.erje.net!1.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	[PATCH] net: qrtr: fix build problems
Date	Fri, 13 May 2016 15:20:02 +0200
Message-ID	<rylax-3Vi-13@gated-at.bofh.it> (permalink)
X-Original-To	"David S. Miller" <davem@davemloft.net>
X-Mailer	git-send-email 2.7.0
X-Provags-ID	V03:K0:pF8KIz+z09yGvjdUsag78zNHYIM+PI8ExobyiZNN3udD9xbbzC1 AhTlXIsyjc8c3rkt1NHZpSEjwLkjvrUy2g5mTt5X37G4SttFZrCHzZDN/RDCMFA/1GDCHrY D2F9CD3meL6ZduVBstKDEJ4gPLsWodCmCBfpqr3VUqjYikgs54FVA9HF2t1dsdC8qU1IUGH U9V9XFC34BZd0geDfFgMA==
X-Ui-Out-Filterresults	notjunk:1;V01:K0:pcwoD+5ciLw=:rMgIdq5W4apFEW33MHuW/n gbWDMq19SM7x/ylp3t8sV24mtyMR20qekZSkpq+lWOq9cIxy6HKJ4Kne7/llGYuUsE32HfYp6 vTcD5yJe94+Gq1fbiaUiODAlEop7vgu7EGiHq9C7kwRlQ5QcE22OKJXwmKfRmnuHiltVnbA0G HoKk2huiGKjlWHTBsyM5zBYixQTVURWwYlvylCtppHQmcN6JAWDBPVV8cXsf1vN1EJ5zvkowA gl/iNbz6FCjbrmoBuBAY8Hd8gFOmFLrA2QZNugcax/5n+R8wPlNLJmBA1sIbToPBnAEibJlTB dfDnfJmy0sUPE9S1G2vQqfA6gcp4/nb7YihvD2HMZfIIXOho+WxTzztvKFTloMegO8XfXsVjK co207w/BSMhvrX7sYjb0uBdPvUCN+uzj4u/k8e3CYs4aByCr2XdF3aTRcZbuuQH3M2jJr4v5O t49m+7TFPF3Nn0UU5QLj65ih9v611LZilEAhBKg5ogG7sqSwuiX+9teJ9wZo11Yna7jPeEpTe 6HpwLeuH2tXcjzELkUjbyxANPEPALpsiQRavEZydh69PjBf4NgZewu9V+ayVoo0az+GokMTfb 1E3gT+WVYpAZUiIWujC95JlO1Tb0EP5IfruB54oph0Sy1h92FYKFSLBGgtT+GgI/1JeQ5acrh EueRIdzw7+rCBIty9bB+/j4v2FgHJd4Tq1tYAlQ1WBqCQDjDJpX+6mIxIBocgeDzTtTw=
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	57
Organization	linux.* mail to news gateway
X-Original-Cc	Arnd Bergmann <arnd@arndb.de>, Bjorn Andersson <bjorn.andersson@sonymobile.com>, Courtney Cavin <courtney.cavin@sonymobile.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Fri, 13 May 2016 15:09:58 +0200
X-Original-Message-ID	<1463145025-4011396-1-git-send-email-arnd@arndb.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1400783

Show key headers only | View raw

Having multiple loadable modules with the same name cannot work
with modprobe, and having both net/qrtr/smd.ko and drivers/soc/qcom/smd.ko
results in a (somewhat cryptic) build error:

ERROR: "qcom_smd_driver_unregister" [net/qrtr/smd.ko] undefined!
ERROR: "qcom_smd_driver_register" [net/qrtr/smd.ko] undefined!
ERROR: "qcom_smd_set_drvdata" [net/qrtr/smd.ko] undefined!
ERROR: "qcom_smd_send" [net/qrtr/smd.ko] undefined!
ERROR: "qcom_smd_get_drvdata" [net/qrtr/smd.ko] undefined!
ERROR: "qcom_smd_driver_unregister" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
ERROR: "qcom_smd_driver_register" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
ERROR: "qcom_smd_set_drvdata" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
ERROR: "qcom_smd_send" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
ERROR: "qcom_smd_get_drvdata" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!

Also, the qrtr driver uses the SMD interface and has a Kconfig dependency,
but also allows for compile-testing when SMD is disabled. However, if
with QCOM_SMD=m and COMPILE_TEST=y we can end up with QRTR_SMD=y and
that fails with a related link error.

The changes the dependency so we can still compile-test the driver but
not have it built-in if SMD is a module, to avoid running in the broken
configuration, and changes the Makefile to provide the driver under
a different module name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: bdabad3e363d ("net: Add Qualcomm IPC router")
---
 net/qrtr/Kconfig  | 2 +-
 net/qrtr/Makefile | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/qrtr/Kconfig b/net/qrtr/Kconfig
index 673fd1f86ebe..b83c6807a5ae 100644
--- a/net/qrtr/Kconfig
+++ b/net/qrtr/Kconfig
@@ -16,7 +16,7 @@ if QRTR
 
 config QRTR_SMD
 	tristate "SMD IPC Router channels"
-	depends on QCOM_SMD || COMPILE_TEST
+	depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n)
 	---help---
 	  Say Y here to support SMD based ipcrouter channels.  SMD is the
 	  most common transport for IPC Router.
diff --git a/net/qrtr/Makefile b/net/qrtr/Makefile
index 6c00dc623b7e..ab09e40f7c74 100644
--- a/net/qrtr/Makefile
+++ b/net/qrtr/Makefile
@@ -1,2 +1,4 @@
 obj-$(CONFIG_QRTR) := qrtr.o
-obj-$(CONFIG_QRTR_SMD) += smd.o
+
+obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o
+qrtr-smd-y	:= smd.o
-- 
2.7.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] net: qrtr: fix build problems Arnd Bergmann <arnd@arndb.de> - 2016-05-13 15:20 +0200
  Re: [PATCH] net: qrtr: fix build problems David Miller <davem@davemloft.net> - 2016-05-16 19:50 +0200

csiph-web