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: 91937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3440142vqo; Wed, 10 May 2023 00:56:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6EZ+p1fYWLGrKKPuzB4ZzlapF1YOPMYraBxZX4Euyrl4qTlrXXH34TzfCeslsDnfDvFVen X-Received: by 2002:a05:6a00:1343:b0:646:c30d:e9c2 with SMTP id k3-20020a056a00134300b00646c30de9c2mr8950329pfu.28.1683705401021; Wed, 10 May 2023 00:56:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683705401; cv=none; d=google.com; s=arc-20160816; b=nZnRK+0tY7T5fuQdZpzvuI1UnOXnxlVSR2hVqaqjo7yOhgrxVjoL5A1VjuykiwFgL8 CVelsVxxZ0ybZJbyhfXWTaaGw+Fyz4bQ/h1OU7zKNMX+TEnvwPmnM2CYjRhRn6iZmc+Q P++cExcBl7aLjccfI1SYMZYY6KwBH+LQOZqihP03FxnxDbP2gmV9p8dNRMIpMotj66h2 xoy1rxqmUk/G2alvQLC2BUDmAt5k1Ch7FDCJcTkBE5PyamxIHuWSa/O99TdJy5DRQoyI 9nY+DIAKExYGXV0YgMDk8GNDYy/9uHXED6X8zxJb72aWNxcRlOt++c2YICqS26yEfsDu OYbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=BtQPFlqDJgsJOhJjphtgO9KU3wqmiLaUjxsYgolmkNY=; b=wutFH7OPv3nlAJymaUKZaPpEKEam2yB+hO3WsumliXbwBMTTEyNMMlLKx31wc59VhR xW/NX7FNEi+Tu58yq/5vAYowuYUgICb1yJfnOavla685te8r6AULJXC6nE9wR2GMQ0/Y OaG6/iJc5kZEijKch7jlvG80sYHneVxb3W6BspyJwAs6Apl2gNzMVosUeTA7RFTAqSTd HJfOCVnCe/NmxxIefv8lBub9nbykYcdfudQVDEq91ZjAd8MAXSMPrilfxNT09t+zO1Vf RzfyX+lxOeCIfbTI1+v9eP7W4jY2rikP5qPBr/5nhrTbxsscG7o585bHudxpAkNYZb6q 56DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QmFEIJOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f64-20020a625143000000b0063b89234a5asi4327448pfb.371.2023.05.10.00.56.26; Wed, 10 May 2023 00:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QmFEIJOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236038AbjEJHoU (ORCPT + 99 others); Wed, 10 May 2023 03:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236240AbjEJHoR (ORCPT ); Wed, 10 May 2023 03:44:17 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D5932722 for ; Wed, 10 May 2023 00:44:16 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f41d087b24so29137665e9.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=XAZqT2M2qWIiq4v19D+8/cYX5XyT90oTtSSpmDx2yOpYVcQ7oYqeian35ApZeWdOSD bKSTFH36AO5aC5F8De6cLrxybSQHCXUd9kMmTrWEvrK+S8DEWmc5ukaI0E+cQ2fXTnw6 nIWbCSnaG87qqfWKlJIWBx3PSMESp4txsq5+BeHznUwdbLQ5El/eCp+LzL0a8Z8GI4Ss m8OVlpoBO5PwqSJZIUXu389/cuQ0vGBNu78mYcIGj/BCyPnYmXUuUrgcnnw0nFxIBVm6 I1ZUiuYijcMnvmWbUr+XE0yi7TR5UDyXK477/XrVn2XHnKio/R7QZJGskSE26wzgLFJh 8zXg== X-Gm-Message-State: AC+VfDzUbcRG9InKrQMRuipa7ZLQqxYbhpG75k3Hycv4lxK2k+R4GPOD /g50KlatZjHSAEPU/Pn+etIzaA== 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765493074836320576?= X-GMAIL-MSGID: =?utf-8?q?1765493074836320576?= 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