2023-05-16 08:34:22

by Abel Vesa

Subject: [PATCH v3] soc: qcom: Rename ice to qcom_ice to avoid module name conflict

The following error was reported when building x86_64 allmodconfig:

error: the following would cause module name conflict:
drivers/soc/qcom/ice.ko
drivers/net/ethernet/intel/ice/ice.ko

Seems the 'ice' module name is already used by some Intel ethernet
driver, so lets rename the Qualcomm Inline Crypto Engine (ICE) module
from 'ice' to 'qcom_ice' to avoid any kind of errors/confusions.

Reported-by: Stephen Rothwell <[email protected]>
Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver")
Acked-by: Mukesh Ojha <[email protected]>
Signed-off-by: Abel Vesa <[email protected]>
---

Changes since v2:
* kept the filename as 'ice.c' while renaming the modules to 'qcom_ice'

drivers/soc/qcom/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 0f43a88b4894..89b775512bef 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -32,4 +32,5 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o
obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o
-obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += ice.o
+qcom_ice-objs += ice.o
+obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o
--
2.34.1

2023-05-25 05:41:49

by Bjorn Andersson

Subject: Re: [PATCH v3] soc: qcom: Rename ice to qcom_ice to avoid module name conflict

On Tue, 16 May 2023 11:28:56 +0300, Abel Vesa wrote:
> The following error was reported when building x86_64 allmodconfig:
>
> error: the following would cause module name conflict:
> drivers/soc/qcom/ice.ko
> drivers/net/ethernet/intel/ice/ice.ko
>
> Seems the 'ice' module name is already used by some Intel ethernet
> driver, so lets rename the Qualcomm Inline Crypto Engine (ICE) module
> from 'ice' to 'qcom_ice' to avoid any kind of errors/confusions.
>
> [...]

Applied, thanks!

[1/1] soc: qcom: Rename ice to qcom_ice to avoid module name conflict
commit: 47820d3263a4a7ba258fe2efe26ae5afb5b83036

Best regards,
--
Bjorn Andersson <[email protected]>