| Message ID | 20230512123632.3024857-1-abel.vesa@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] soc: qcom: Rename ice to qcom_ice to avoid module name conflict | expand |
On 5/12/2023 6:06 PM, 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) from > 'ice' to 'qcom_ice' to avoid any kind of errors/confusions. > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") > Signed-off-by: Abel Vesa <abel.vesa@linaro.org> Acked-by: Mukesh Ojha <quic_mojha@quicinc.com> -- Mukesh > --- > > Changes since v1: > * changed filename from qcom-ice.c to qcom_ice.c (with underscore) > to be in line with other Qcom SoC drivers. > > drivers/soc/qcom/Makefile | 2 +- > drivers/soc/qcom/{ice.c => qcom_ice.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename drivers/soc/qcom/{ice.c => qcom_ice.c} (100%) > > diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile > index 0f43a88b4894..cacf3113ec3c 100644 > --- a/drivers/soc/qcom/Makefile > +++ b/drivers/soc/qcom/Makefile > @@ -32,4 +32,4 @@ 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 > +obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o > diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/qcom_ice.c > similarity index 100% > rename from drivers/soc/qcom/ice.c > rename to drivers/soc/qcom/qcom_ice.c
On Fri, May 12, 2023 at 03:36:32PM +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) from > 'ice' to 'qcom_ice' to avoid any kind of errors/confusions. > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") > Signed-off-by: Abel Vesa <abel.vesa@linaro.org> > --- > > Changes since v1: > * changed filename from qcom-ice.c to qcom_ice.c (with underscore) > to be in line with other Qcom SoC drivers. > > drivers/soc/qcom/Makefile | 2 +- > drivers/soc/qcom/{ice.c => qcom_ice.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename drivers/soc/qcom/{ice.c => qcom_ice.c} (100%) I'd also prefer that the filename stayed ice.c and just the module was renamed, given that this is already in the drivers/soc/qcom/ directory. - Eric
On Fri, 12 May 2023 15:36:32 +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) 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,
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 0f43a88b4894..cacf3113ec3c 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -32,4 +32,4 @@ 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 +obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/qcom_ice.c similarity index 100% rename from drivers/soc/qcom/ice.c rename to drivers/soc/qcom/qcom_ice.c
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) from 'ice' to 'qcom_ice' to avoid any kind of errors/confusions. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") Signed-off-by: Abel Vesa <abel.vesa@linaro.org> --- Changes since v1: * changed filename from qcom-ice.c to qcom_ice.c (with underscore) to be in line with other Qcom SoC drivers. drivers/soc/qcom/Makefile | 2 +- drivers/soc/qcom/{ice.c => qcom_ice.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/soc/qcom/{ice.c => qcom_ice.c} (100%)