From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3970AC7EE25 for ; Fri, 12 May 2023 12:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240509AbjELMmM (ORCPT ); Fri, 12 May 2023 08:42:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240465AbjELMmL (ORCPT ); Fri, 12 May 2023 08:42:11 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A6902703 for ; Fri, 12 May 2023 05:42:10 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1ab1b79d3a7so68760405ad.3 for ; Fri, 12 May 2023 05:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683895330; x=1686487330; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=Qu/58O+9pf0u9+V9v8oS+vJYZNsaPk6xzd+mj1JOqFQ=; b=drUCX9L1rNzpL99T066bzQ1ykR+zm9d4HaTIie5pcv/T2mw5Ob9YeHWALcaqvyJipm YbYg6nOkOr/TKqy9VdNSVeef0wxc7wz6MZqksJJJS1lHnM+TT3uqokc1v1lJo1qZRl1w M00+XxB9j8d3UdiHW/qg0glG01JlDsNSyYTj4baj+RVgYXG6kbaoOIPq83DQjHqPJkv3 D26OZlxwl2Etzse2yz9sn+CBOhgz+iG4c/poStueJ0wddzXn9zB5fFRCgFe9S8+TmX7H h+/AVI2MHgQVyfbzdbyWyIGDJKbcScJpCaD/MAqgqNggRxARF5+Z8eGd84vfB/0DoikW 6Oyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683895330; x=1686487330; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Qu/58O+9pf0u9+V9v8oS+vJYZNsaPk6xzd+mj1JOqFQ=; b=C6yF4/J2cKUmFXQpj5dTt6AAu4JCHBMDAcN7UftYuCC9QqcZGy6NtuapyJOkWhF4tu hw/mC0xA80gskFV99Otz7QxTF25gYT7gadKmbwQKKPXG9mmcxdD6Kqn57buFsV4798jg tPnHyPmoAsDJjy/bQHDLN43ToR7DL2m3d3sIlrYKLwIX35xKx7yPMJY2YAFF8Y6ewdri 7vJswVSaZbAfKLhzY38R7g7ykcIkdHgyQPs96EdQ5LKjzvMpJvg1zpyGnoIAx4uDRJIG OkPLZb8yo8sjqE1mUsITObnZig5c1kpSoLvzAoQ2UPFnq3zIuQMVrCANhB6Ji8uJjdcw cHgw== X-Gm-Message-State: AC+VfDyfopEtak/hN5cuVTtVCMdoyMnaBnFp4lveQLS5rUnRSIhmg/H1 UYJJVvXJXdLH2o/nhuWa80RA X-Google-Smtp-Source: ACHHUZ7QsZqjOg1/Tz1AHBUSyhMYiIoxZXlvNXvnn6SZwWdImt8AJZ6Qwj6TxHJeOv6Sv04r4SlEZQ== X-Received: by 2002:a17:902:f547:b0:1ab:bfb:4b6e with SMTP id h7-20020a170902f54700b001ab0bfb4b6emr33563395plf.31.1683895329810; Fri, 12 May 2023 05:42:09 -0700 (PDT) Received: from thinkpad ([117.202.185.214]) by smtp.gmail.com with ESMTPSA id f10-20020a17090274ca00b001ab28f620d0sm7826980plt.290.2023.05.12.05.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 05:42:09 -0700 (PDT) Date: Fri, 12 May 2023 18:12:03 +0530 From: Manivannan Sadhasivam To: Abel Vesa Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org, Linux Kernel Mailing List , Ulf Hansson , Jakub Kicinski , Eric Biggers , Stephen Rothwell Subject: Re: [PATCH] soc: qcom: Rename ice to qcom-ice to avoid module name conflict Message-ID: <20230512124203.GA13620@thinkpad> References: <20230510074404.3520340-1-abel.vesa@linaro.org> <20230510082555.GA7268@thinkpad> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, May 12, 2023 at 02:53:26PM +0300, Abel Vesa wrote: > On 23-05-10 13:55:55, Manivannan Sadhasivam wrote: > > On Wed, May 10, 2023 at 10:44:04AM +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 > > > Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") > > > Signed-off-by: Abel Vesa > > > --- > > > > > > The build failure was reported here: > > > https://lore.kernel.org/all/20230510111833.17810885@canb.auug.org.au/ > > > > > > 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%) > > > > > > > You can just rename the module name to "qcom-ice" and still keep the driver name > > as "ice" as it is already under "qcom" subdirectory. > > > > We do it for other drivers as well. > > Yes, but in this case, it is not worth keeping the file name as is. > Since you already have "qcom" as the parent directory name, I don't know how adding "qcom" prefix for the drivers in child directory helps. It is required for the module name but not for the driver name. If you look at current qcom soc drivers, then most of them are without prefix but _some_ are with prefix. And the later ones doesn't make sense to me, But I'll leave it to Bjorn to take the call. - Mani > I'll send another version of this patch with the filename as qcom_ice.c > in order to be inline with the other ones. > > > > > - Mani > > > > > diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile > > > index 0f43a88b4894..30219c164cb0 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 > > > -- > > > 2.34.1 > > > > > > > -- > > மணிவண்ணன் சதாசிவம் -- மணிவண்ணன் சதாசிவம்