linux-kernel - [PATCH] media: iris: rename module file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20250219080200.3907925-1-arnd@kernel.org>
Date: Wed, 19 Feb 2025 09:01:53 +0100
From: Arnd Bergmann <arnd@...nel.org>
To: Vikash Garodia <quic_vgarodia@...cinc.com>,
	Dikshita Agarwal <quic_dikshita@...cinc.com>,
	Mauro Carvalho Chehab <mchehab@...nel.org>,
	Hans Verkuil <hverkuil@...all.nl>,
	"Bryan O'Donoghue" <bryan.odonoghue@...aro.org>,
	Stefan Schmidt <stefan.schmidt@...aro.org>
Cc: Arnd Bergmann <arnd@...db.de>,
	Shérab <Sebastien.Hinderer@...-lyon.org>,
	Abhinav Kumar <quic_abhinavk@...cinc.com>,
	Vedang Nagar <quic_vnagar@...cinc.com>,
	linux-media@...r.kernel.org,
	linux-arm-msm@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] media: iris: rename module file

From: Arnd Bergmann <arnd@...db.de>

Build-testing on x86 showed two modules with conflicting "iris.ko"
names after the addition of the qualcomm driver:

   error: the following would cause module name conflict:
     arch/x86/platform/iris/iris.ko
     drivers/media/platform/qcom/iris/iris.ko

Since this a new module, nothing should rely on the name yet, so
rename this one to a more specific "qcom-iris.ko".

Fixes: 38506cb7e8d2 ("media: iris: add platform driver for iris video device")
Cc: Shérab <Sebastien.Hinderer@...-lyon.org> # for x86 iris
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
 drivers/media/platform/qcom/iris/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
index f6d22b88f6db..35390534534e 100644
--- a/drivers/media/platform/qcom/iris/Makefile
+++ b/drivers/media/platform/qcom/iris/Makefile
@@ -1,4 +1,5 @@
-iris-objs += iris_buffer.o \
+qcom-iris-objs += \
+	     iris_buffer.o \
              iris_core.o \
              iris_ctrls.o \
              iris_firmware.o \
@@ -24,7 +25,7 @@ iris-objs += iris_buffer.o \
              iris_vpu_common.o \
 
 ifeq ($(CONFIG_VIDEO_QCOM_VENUS),)
-iris-objs += iris_platform_sm8250.o
+qcom-iris-objs += iris_platform_sm8250.o
 endif
 
-obj-$(CONFIG_VIDEO_QCOM_IRIS) += iris.o
+obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
-- 
2.39.5