From patchwork Wed May 10 07:44:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 680588 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 D285BC77B7C for ; Wed, 10 May 2023 07:44:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229506AbjEJHoT (ORCPT ); Wed, 10 May 2023 03:44:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236226AbjEJHoR (ORCPT ); Wed, 10 May 2023 03:44:17 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E5B430CB for ; Wed, 10 May 2023 00:44:16 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f41d087b24so29137675e9.1 for ; Wed, 10 May 2023 00:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683704655; x=1686296655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BtQPFlqDJgsJOhJjphtgO9KU3wqmiLaUjxsYgolmkNY=; b=QmFEIJOHl50deNQSptWiiSgu6+lK0ojb2twXb2fNfhePK6cEQ7kFaCNqJ1hdmbE7L2 l0yYrDfBefzqo90kb1jTg+4kdBDIU/IU6+vqPQkDA5WD8luFJJNjEjMhPW9GxjN0xzmE gW5MiB+sgw1BtTI2qPK7Y2tKcu+897yB8NuQ8b+YhqnZ+QkNYnVVr5YZH7SuzbILaGyF IM8orS0BqOTDyk8uHW8DajyR92lsao4HNqlXNUAZV6VAyZ+G6z0t4t+cpqr3EIJNiVYC Lb2ov029rl3Pt0ZeLKYZ66po39iWUjfQOdbLa1k1QoRt8isQeO4P5XIrLXoW2hG18FkY UY9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683704655; x=1686296655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BtQPFlqDJgsJOhJjphtgO9KU3wqmiLaUjxsYgolmkNY=; b=KJ0Wp2JWSD/zeB4Hp6A0CSU9mVX5pHKGoxNOKmaYAoERmTnXdNAR0g6RrqYkCkwkeK A3OZjXkQF5JrOoaQ5LmWzj9TWPy4HElW42YS3x+ky/nVg4bFhjO1lcDNWg2rQ+9pjEFs 1cYBJTlqN78LMnt51aSdygAajrhahp59pqAKM7yq8gbHlfuNKonrUve18kjCTweyelM3 Z0iwAOmmZCoOVfyA3J9NsL0FmeK+L2eiJy0AWhH5hyLpm2YFYugZIgwdrCpmhnRKjEZ8 eKZhpgSXUGPFXsw+vDNXOc4N5xDIsMt52eJNGZgBWWtLG6KgQCKAn65eFv6wcNynXLMg OYYA== X-Gm-Message-State: AC+VfDwX9LCeF1FFzxmEOeYM2yFkkT9JMOrjytJnKasPlZx7cIMq8Rsj cA/StAcRPPa6+q3JJ2kTJ/irYA== X-Google-Smtp-Source: ACHHUZ65q8nnPXwnXG297J3KAXm87os0LF1VqdeR3GC8I3QkknH+TG+s0Li9tmLG1xcRm5IYMYXh3g== X-Received: by 2002:a7b:c40f:0:b0:3f4:2300:e015 with SMTP id k15-20020a7bc40f000000b003f42300e015mr7651495wmi.5.1683704654737; Wed, 10 May 2023 00:44:14 -0700 (PDT) Received: from hackbox.lan ([86.121.163.20]) by smtp.gmail.com with ESMTPSA id p5-20020a7bcc85000000b003f4dde07956sm261653wma.42.2023.05.10.00.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 00:44:14 -0700 (PDT) From: Abel Vesa To: Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, Linux Kernel Mailing List , Ulf Hansson , Jakub Kicinski , Eric Biggers , Stephen Rothwell Subject: [PATCH] soc: qcom: Rename ice to qcom-ice to avoid module name conflict Date: Wed, 10 May 2023 10:44:04 +0300 Message-Id: <20230510074404.3520340-1-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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%) 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