Skip to contentSkip to conversation

rpmsg: smd: fix dependency on QCOM_SMD=n

PATCH In review Arnd Bergmann 2 participants 2 messages Sep 12, 2016 Remote processor messaging (rpmsg)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rpmsg: smd: fix dependency on QCOM_SMD=n

The ARM allmodconfig build broke with the addition of the SMD rpmsg driver that conflicts with the driver its replaces:

WARNING: drivers/soc/qcom/smd: 'qcom_smd_register_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko
WARNING: drivers/soc/qcom/smd: 'qcom_smd_unregister_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko

There is already a dependency that is meant to avoid the broken configuration, but that only prevents the case where at least one of the two are built-in, but not if both are modules.

This changes the dependency to "=n", to ensure that the new driver can only be enabled if the other one is completely disabled.

Fixes 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend")
---
 drivers/rpmsg/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/Kconfig +1 -1
index 9ba5a2e5c930..de31c5f14dd9 100644
@@ -7,7 +7,7 @@ config RPMSG
 config RPMSG_QCOM_SMD
 	tristate "Qualcomm Shared Memory Driver (SMD)"
 	depends on QCOM_SMEM
-	depends on !QCOM_SMD
+	depends on QCOM_SMD=n
 	select RPMSG
 	help
 	  Say y here to enable support for the Qualcomm Shared Memory Driver
Signature · 1 line
2.9.0
#1 lore raw
Quoted 24 lines · Arnd Bergmann

The ARM allmodconfig build broke with the addition of the SMD rpmsg driver that conflicts with the driver its replaces:

WARNING: drivers/soc/qcom/smd: 'qcom_smd_register_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko
WARNING: drivers/soc/qcom/smd: 'qcom_smd_unregister_edge' exported twice. Previous export was in drivers/rpmsg/qcom_smd.ko

There is already a dependency that is meant to avoid the broken configuration, but that only prevents the case where at least one of the two are built-in, but not if both are modules.

This changes the dependency to "=n", to ensure that the new driver can only be enabled if the other one is completely disabled.

Fixes 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend")
---
 drivers/rpmsg/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/Kconfig +0 -0
index 9ba5a2e5c930..de31c5f14dd9 100644

drivers/rpmsg/Kconfig config RPMSG · line 13

Quoted 8 lines
drivers/rpmsg/Kconfig +1 -1
@@ -7,7 +7,7 @@ config RPMSG
 config RPMSG_QCOM_SMD
 	tristate "Qualcomm Shared Memory Driver (SMD)"
 	depends on QCOM_SMEM
-	depends on !QCOM_SMD
+	depends on QCOM_SMD=n
 	select RPMSG
 	help
 	  Say y here to enable support for the Qualcomm Shared Memory Driver

Of course, time to study this grammar again...

Thanks,
Bjorn