[PATCH] Input: apm-power - Rename to apm-power-input

[PATCH] Input: apm-power - Rename to apm-power-input

[Nathan Chancellor]

When scripts/modules-check.sh is fixed to normalize the module's name
like name-fix-token does in scripts/Makefile.lib before checking that it
is unique [1], there is an error due to drivers/input/apm-power.ko and
drivers/power/supply/apm_power.ko having the same module name.

  error: the following would cause module name conflict:
    drivers/input/apm-power.ko
    drivers/power/supply/apm_power.ko

  $ modinfo drivers/input/apm-power.ko drivers/power/supply/apm_power.ko | grep name:
  filename:       drivers/input/apm-power.ko
  name:           apm_power
  filename:       drivers/power/supply/apm_power.ko
  name:           apm_power

Rename drivers/input/apm-power.c to apm-power-input.c to make the module
name unique and clear up the error.

Reported-by: Sasha Levin <sashal@kernel.org>
Closes: https://lore.kernel.org/20261108225808.1809266-1-sashal@kernel.org/
Link: https://lore.kernel.org/20261103110411.11698-1-info@daylightlinux.ch/ [1]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
We would like to take [1] for 7.5 in kbuild-next, so we would appreciate
an ack to take this directly or a stable branch that we can pull in.
---
 drivers/input/Makefile                           | 2 +-
 drivers/input/{apm-power.c => apm-power-input.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 2cd6e1c9a778..842a7e4f7b50 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -27,6 +27,6 @@ obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touchscreen/
 obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_KUNIT_TEST)	+= tests/
 
-obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
+obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power-input.o
 
 obj-$(CONFIG_RMI4_CORE)		+= rmi4/
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power-input.c
similarity index 100%
rename from drivers/input/apm-power.c
rename to drivers/input/apm-power-input.c

---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
change-id: 20261109-apm-power-input-rename-a2da3030d47a

Best regards,
--  
Cheers,
Nathan

Re: [PATCH] Input: apm-power - Rename to apm-power-input

[Nicolas Schier]

On Mon, Nov 09, 2026 at 01:25:26AM -0500, Nathan Chancellor wrote:
> When scripts/modules-check.sh is fixed to normalize the module's name
> like name-fix-token does in scripts/Makefile.lib before checking that it
> is unique [1], there is an error due to drivers/input/apm-power.ko and
> drivers/power/supply/apm_power.ko having the same module name.
> 
>   error: the following would cause module name conflict:
>     drivers/input/apm-power.ko
>     drivers/power/supply/apm_power.ko
> 
>   $ modinfo drivers/input/apm-power.ko drivers/power/supply/apm_power.ko | grep name:
>   filename:       drivers/input/apm-power.ko
>   name:           apm_power
>   filename:       drivers/power/supply/apm_power.ko
>   name:           apm_power
> 
> Rename drivers/input/apm-power.c to apm-power-input.c to make the module
> name unique and clear up the error.
> 
> Reported-by: Sasha Levin <sashal@kernel.org>
> Closes: https://lore.kernel.org/20261108225808.1809266-1-sashal@kernel.org/
> Link: https://lore.kernel.org/20261103110411.11698-1-info@daylightlinux.ch/ [1]
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
> We would like to take [1] for 7.5 in kbuild-next, so we would appreciate
> an ack to take this directly or a stable branch that we can pull in.
> ---
>  drivers/input/Makefile                           | 2 +-
>  drivers/input/{apm-power.c => apm-power-input.c} | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 

Thanks!

Reviewed-by: Nicolas Schier <nsc@kernel.org>

-- 
Nicolas