mfd: rsmu: fix mixed module-builtin object
PATCH 1/2 mfd: rsmu: fix mixed module-builtin object
With CONFIG_MFD_RSMU_I2C=m and CONFIG_MFD_RSMU_SPI=y (or vice versa), rsmu_core.o is linked to a module and also to vmlinux even though the expected CFLAGS are different between builtins and modules.
This is the same situation as fixed by commit 637a642f5ca5 ("zstd:
Fixing mixed module-builtin objects").
Split rsmu-core into a separate module.
---
drivers/mfd/Kconfig | 8 ++++++-- drivers/mfd/Makefile | 6 ++++-- drivers/mfd/rsmu_core.c | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-)
drivers/mfd/Kconfig +6 -2
@@ -2215,10 +2215,14 @@ config MFD_INTEL_M10_BMC_PMCI additional drivers must be enabled in order to use the functionality of the device. +config MFD_RSMU_CORE + tristate + select MFD_CORE + config MFD_RSMU_I2C tristate "Renesas Synchronization Management Unit with I2C" depends on I2C && OF - select MFD_CORE + select MFD_RSMU_CORE select REGMAP_I2C help Support for the Renesas Synchronization Management Unit, such as
@@ -2232,7 +2236,7 @@ config MFD_RSMU_I2C config MFD_RSMU_SPI tristate "Renesas Synchronization Management Unit with SPI" depends on SPI && OF - select MFD_CORE + select MFD_RSMU_CORE select REGMAP_SPI help Support for the Renesas Synchronization Management Unit, such as
drivers/mfd/Makefile +4 -2
@@ -271,7 +271,9 @@ obj-$(CONFIG_MFD_INTEL_M10_BMC_PMCI) += intel-m10-bmc-pmci.o obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o -rsmu-i2c-objs := rsmu_core.o rsmu_i2c.o -rsmu-spi-objs := rsmu_core.o rsmu_spi.o +rsmu-core-objs := rsmu_core.o +rsmu-i2c-objs := rsmu_i2c.o +rsmu-spi-objs := rsmu_spi.o +obj-$(CONFIG_MFD_RSMU_CORE) += rsmu-core.o obj-$(CONFIG_MFD_RSMU_I2C) += rsmu-i2c.o obj-$(CONFIG_MFD_RSMU_SPI) += rsmu-spi.o
drivers/mfd/rsmu_core.c +3 -0
@@ -5,6 +5,7 @@* Copyright (C) 2021 Integrated Device Technology, Inc., a Renesas Company. */ +#include <linux/export.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/mfd/core.h>
@@ -78,11 +79,13 @@ int rsmu_core_init(struct rsmu_ddata *rsmu)return ret; } +EXPORT_SYMBOL_GPL (rsmu_core_init);void rsmu_core_exit (struct rsmu_ddata *rsmu) {mutex_destroy (&rsmu->lock); } +EXPORT_SYMBOL_GPL (rsmu_core_exit);MODULE_DESCRIPTION ("Renesas SMU core driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.39.2
PATCH 2/2 mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules
With the previous fix, these modules are built from a single C file.
Rename the source files so they match the module names.
---
drivers/mfd/Makefile | 3 ---
drivers/mfd/{rsmu_core.c => rsmu-core.c} | 0
drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} | 0
drivers/mfd/{rsmu_spi.c => rsmu-spi.c} | 0
4 files changed, 3 deletions(-)
rename drivers/mfd/{rsmu_core.c => rsmu-core.c} (100%)
rename drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} (100%)
rename drivers/mfd/{rsmu_spi.c => rsmu-spi.c} (100%)drivers/mfd/Makefile +0 -3
@@ -271,9 +271,6 @@ obj-$(CONFIG_MFD_INTEL_M10_BMC_PMCI) += intel-m10-bmc-pmci.o obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o -rsmu-core-objs := rsmu_core.o -rsmu-i2c-objs := rsmu_i2c.o -rsmu-spi-objs := rsmu_spi.o obj-$(CONFIG_MFD_RSMU_CORE) += rsmu-core.o obj-$(CONFIG_MFD_RSMU_I2C) += rsmu-i2c.o obj-$(CONFIG_MFD_RSMU_SPI) += rsmu-spi.o
drivers/mfd/rsmu-core.c renamed from drivers/mfd/rsmu_core.c +0 -0
drivers/mfd/rsmu-i2c.c renamed from drivers/mfd/rsmu_i2c.c +0 -0
drivers/mfd/rsmu-spi.c renamed from drivers/mfd/rsmu_spi.c +0 -0
Signature · 1 line
2.39.2
Lee Jones
maintainerRe: [PATCH 2/2] mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules
Quoted 3 lines · Masahiro Yamada
With the previous fix, these modules are built from a single C file.
Rename the source files so they match the module names.
Should this be part of the previous patch?
Quoted 41 lines
Signed-off-by Masahiro Yamada <[email protected]>---
drivers/mfd/Makefile | 3 --- drivers/mfd/{rsmu_core.c => rsmu-core.c} | 0 drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} | 0 drivers/mfd/{rsmu_spi.c => rsmu-spi.c} | 0 4 files changed, 3 deletions(-) rename drivers/mfd/{rsmu_core.c => rsmu-core.c} (100%) rename drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} (100%) rename drivers/mfd/{rsmu_spi.c => rsmu-spi.c} (100%)drivers/mfd/Makefile +0
-3@@ -271,9 +271,6 @@ obj-$(CONFIG_MFD_INTEL_M10_BMC_PMCI) += intel-m10-bmc-pmci.o obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o -rsmu-core-objs := rsmu_core.o -rsmu-i2c-objs := rsmu_i2c.o -rsmu-spi-objs := rsmu_spi.o obj-$(CONFIG_MFD_RSMU_CORE) += rsmu-core.o obj-$(CONFIG_MFD_RSMU_I2C) += rsmu-i2c.o obj-$(CONFIG_MFD_RSMU_SPI) += rsmu-spi.odrivers/mfd/rsmu-core.c renamed from drivers/mfd/rsmu_core.c +0
-0drivers/mfd/rsmu-i2c.c renamed from drivers/mfd/rsmu_i2c.c +0
-0drivers/mfd/rsmu-spi.c renamed from drivers/mfd/rsmu_spi.c +0
-0Signature · 1 line
2.39.2
Signature · 1 line
Lee Jones [李琼斯]
Re: [PATCH 2/2] mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules
Quoted 8 lines · Lee Jones
Quoted 3 lines · Masahiro Yamada
With the previous fix, these modules are built from a single C file.
Rename the source files so they match the module names.
Should this be part of the previous patch?
I do not know. It is up to the maintainer's preference (you).
If you want me to send a squashed patch, I will be happy to do so.
Masahiro
Signature · 2 lines
Best Regards Masahiro Yamada
Lee Jones
maintainerRe: [PATCH 2/2] mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules
Quoted 8 lines · Masahiro Yamada
Quoted 7 lines · Lee Jones
Quoted 3 lines · Masahiro Yamada
With the previous fix, these modules are built from a single C file.
Rename the source files so they match the module names.
Quoted 7 lines
Quoted 1 line
Should this be part of the previous patch?
I do not know. It is up to the maintainer's preference (you).
If you want me to send a squashed patch, I will be happy to do so.
I think it makes sense in this case.
Signature · 1 line
Lee Jones [李琼斯]