[2/2] mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules

Message ID 20230604042557.900590-2-masahiroy@kernel.org
State New
Headers
Series [1/2] mfd: rsmu: fix mixed module-builtin object |

Commit Message

Masahiro Yamada June 4, 2023, 4:25 a.m. UTC
  With the previous fix, these modules are built from a single C file.

Rename the source files so they match the module names.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 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%)
  

Comments

Lee Jones June 15, 2023, 2 p.m. UTC | #1
On Sun, 04 Jun 2023, Masahiro Yamada wrote:

> 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?

> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  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%)
> 
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 2a0e80f941a1..0fe213858974 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -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
> diff --git a/drivers/mfd/rsmu_core.c b/drivers/mfd/rsmu-core.c
> similarity index 100%
> rename from drivers/mfd/rsmu_core.c
> rename to drivers/mfd/rsmu-core.c
> diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu-i2c.c
> similarity index 100%
> rename from drivers/mfd/rsmu_i2c.c
> rename to drivers/mfd/rsmu-i2c.c
> diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu-spi.c
> similarity index 100%
> rename from drivers/mfd/rsmu_spi.c
> rename to drivers/mfd/rsmu-spi.c
> -- 
> 2.39.2
>
  
Masahiro Yamada June 16, 2023, 5:03 a.m. UTC | #2
On Thu, Jun 15, 2023 at 11:00 PM Lee Jones <lee@kernel.org> wrote:
>
> On Sun, 04 Jun 2023, Masahiro Yamada wrote:
>
> > 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
  
Lee Jones June 19, 2023, 8:33 a.m. UTC | #3
On Fri, 16 Jun 2023, Masahiro Yamada wrote:

> On Thu, Jun 15, 2023 at 11:00 PM Lee Jones <lee@kernel.org> wrote:
> >
> > On Sun, 04 Jun 2023, Masahiro Yamada wrote:
> >
> > > 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.

I think it makes sense in this case.
  

Patch

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 2a0e80f941a1..0fe213858974 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -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
diff --git a/drivers/mfd/rsmu_core.c b/drivers/mfd/rsmu-core.c
similarity index 100%
rename from drivers/mfd/rsmu_core.c
rename to drivers/mfd/rsmu-core.c
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu-i2c.c
similarity index 100%
rename from drivers/mfd/rsmu_i2c.c
rename to drivers/mfd/rsmu-i2c.c
diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu-spi.c
similarity index 100%
rename from drivers/mfd/rsmu_spi.c
rename to drivers/mfd/rsmu-spi.c