[PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andy Shevchenko]

*-objs suffix is reserved rather for (user-space) host programs while
usually *-y suffix is used for kernel drivers (although *-objs works
for that purpose for now).

Let's correct the old usages of *-objs in Makefiles.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: I2C_AT91_SLAVE_EXPERIMENTAL has to be boolean (LKP)
 drivers/i2c/busses/Kconfig  |  4 ++--
 drivers/i2c/busses/Makefile | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index bf79628a789d..20a8c88e854a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -431,7 +431,7 @@ config I2C_AT91
 	  are facing this situation, use the i2c-gpio driver.
 
 config I2C_AT91_SLAVE_EXPERIMENTAL
-	tristate "Microchip AT91 I2C experimental slave mode"
+	bool "Microchip AT91 I2C experimental slave mode"
 	depends on I2C_AT91
 	select I2C_SLAVE
 	help
@@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
 	  been tested in a heavy way, help wanted.
 	  There are known bugs:
 	    - It can hang, on a SAMA5D4, after several transfers.
-	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
+	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
 	    master.
 
 config I2C_AU1550
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 613ec59502c8..bf2d76e055c5 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -39,10 +39,8 @@ obj-$(CONFIG_I2C_AMD_MP2)	+= i2c-amd-mp2-pci.o i2c-amd-mp2-plat.o
 obj-$(CONFIG_I2C_AMD_ASF)	+= i2c-amd-asf-plat.o
 obj-$(CONFIG_I2C_ASPEED)	+= i2c-aspeed.o
 obj-$(CONFIG_I2C_AT91)		+= i2c-at91.o
-i2c-at91-objs			:= i2c-at91-core.o i2c-at91-master.o
-ifeq ($(CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL),y)
-	i2c-at91-objs		+= i2c-at91-slave.o
-endif
+i2c-at91-y			:= i2c-at91-core.o i2c-at91-master.o
+i2c-at91-$(CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL)	+= i2c-at91-slave.o
 obj-$(CONFIG_I2C_AU1550)	+= i2c-au1550.o
 obj-$(CONFIG_I2C_AXXIA)		+= i2c-axxia.o
 obj-$(CONFIG_I2C_BCM2835)	+= i2c-bcm2835.o
@@ -111,8 +109,8 @@ obj-$(CONFIG_I2C_SIMTEC)	+= i2c-simtec.o
 obj-$(CONFIG_I2C_SPRD)		+= i2c-sprd.o
 obj-$(CONFIG_I2C_ST)		+= i2c-st.o
 obj-$(CONFIG_I2C_STM32F4)	+= i2c-stm32f4.o
-i2c-stm32f7-drv-objs := i2c-stm32f7.o i2c-stm32.o
 obj-$(CONFIG_I2C_STM32F7)	+= i2c-stm32f7-drv.o
+i2c-stm32f7-drv-y		:= i2c-stm32f7.o i2c-stm32.o
 obj-$(CONFIG_I2C_SUN6I_P2WI)	+= i2c-sun6i-p2wi.o
 obj-$(CONFIG_I2C_SYNQUACER)	+= i2c-synquacer.o
 obj-$(CONFIG_I2C_TEGRA)		+= i2c-tegra.o
@@ -121,10 +119,10 @@ obj-$(CONFIG_I2C_UNIPHIER)	+= i2c-uniphier.o
 obj-$(CONFIG_I2C_UNIPHIER_F)	+= i2c-uniphier-f.o
 obj-$(CONFIG_I2C_VERSATILE)	+= i2c-versatile.o
 obj-$(CONFIG_I2C_WMT)		+= i2c-viai2c-wmt.o i2c-viai2c-common.o
-i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o
 obj-$(CONFIG_I2C_OCTEON)	+= i2c-octeon.o
-i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
+i2c-octeon-y			:= i2c-octeon-core.o i2c-octeon-platdrv.o
 obj-$(CONFIG_I2C_THUNDERX)	+= i2c-thunderx.o
+i2c-thunderx-y			:= i2c-octeon-core.o i2c-thunderx-pcidrv.o
 obj-$(CONFIG_I2C_XILINX)	+= i2c-xiic.o
 obj-$(CONFIG_I2C_XLP9XX)	+= i2c-xlp9xx.o
 obj-$(CONFIG_I2C_RCAR)		+= i2c-rcar.o
-- 
2.43.0.rc1.1336.g36b5255a03ac

Re: [PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andi Shyti]

Hi Andy,

On Mon, Nov 04, 2024 at 12:39:14PM +0200, Andy Shevchenko wrote:
> *-objs suffix is reserved rather for (user-space) host programs while
> usually *-y suffix is used for kernel drivers (although *-objs works
> for that purpose for now).
> 
> Let's correct the old usages of *-objs in Makefiles.

...

> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index bf79628a789d..20a8c88e854a 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -431,7 +431,7 @@ config I2C_AT91
>  	  are facing this situation, use the i2c-gpio driver.
>  
>  config I2C_AT91_SLAVE_EXPERIMENTAL
> -	tristate "Microchip AT91 I2C experimental slave mode"
> +	bool "Microchip AT91 I2C experimental slave mode"
>  	depends on I2C_AT91
>  	select I2C_SLAVE
>  	help
> @@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
>  	  been tested in a heavy way, help wanted.
>  	  There are known bugs:
>  	    - It can hang, on a SAMA5D4, after several transfers.
> -	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
> +	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as

Although these changes are related and I'm OK also with the typo
fix, could you please propose here a couple of lines that I can
add to the commit message?

Thanks,
Andi

Re: [PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andy Shevchenko]

On Tue, Nov 05, 2024 at 03:44:34PM +0100, Andi Shyti wrote:
> On Mon, Nov 04, 2024 at 12:39:14PM +0200, Andy Shevchenko wrote:
> > *-objs suffix is reserved rather for (user-space) host programs while
> > usually *-y suffix is used for kernel drivers (although *-objs works
> > for that purpose for now).
> > 
> > Let's correct the old usages of *-objs in Makefiles.

...

> >  config I2C_AT91_SLAVE_EXPERIMENTAL
> > -	tristate "Microchip AT91 I2C experimental slave mode"
> > +	bool "Microchip AT91 I2C experimental slave mode"
> >  	depends on I2C_AT91
> >  	select I2C_SLAVE
> >  	help
> > @@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
> >  	  been tested in a heavy way, help wanted.
> >  	  There are known bugs:
> >  	    - It can hang, on a SAMA5D4, after several transfers.
> > -	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
> > +	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
> 
> Although these changes are related and I'm OK also with the typo
> fix, could you please propose here a couple of lines that I can
> add to the commit message?

Would this work?
"While at it, fix an obvious typo in help section of the Kconfig."

Of course, feel free to drop that hunk or request for a new version without it
(or split into a separate change), I am fine with all options.

Note, bool is essential to for the patch, but can be split as a prerequisite,
but without this patch it doesn't really fix match as we never try to build
the code when it was =m.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andi Shyti]

On Tue, Nov 05, 2024 at 04:56:37PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 05, 2024 at 03:44:34PM +0100, Andi Shyti wrote:
> > On Mon, Nov 04, 2024 at 12:39:14PM +0200, Andy Shevchenko wrote:
> > > *-objs suffix is reserved rather for (user-space) host programs while
> > > usually *-y suffix is used for kernel drivers (although *-objs works
> > > for that purpose for now).
> > > 
> > > Let's correct the old usages of *-objs in Makefiles.
> 
> ...
> 
> > >  config I2C_AT91_SLAVE_EXPERIMENTAL
> > > -	tristate "Microchip AT91 I2C experimental slave mode"
> > > +	bool "Microchip AT91 I2C experimental slave mode"
> > >  	depends on I2C_AT91
> > >  	select I2C_SLAVE
> > >  	help
> > > @@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
> > >  	  been tested in a heavy way, help wanted.
> > >  	  There are known bugs:
> > >  	    - It can hang, on a SAMA5D4, after several transfers.
> > > -	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
> > > +	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
> > 
> > Although these changes are related and I'm OK also with the typo
> > fix, could you please propose here a couple of lines that I can
> > add to the commit message?
> 
> Would this work?
> "While at it, fix an obvious typo in help section of the Kconfig."

works for me.

> Of course, feel free to drop that hunk or request for a new version without it
> (or split into a separate change), I am fine with all options.
> 
> Note, bool is essential to for the patch, but can be split as a prerequisite,
> but without this patch it doesn't really fix match as we never try to build
> the code when it was =m.

As you wish, you can keep it in three patches or I can keep it
as it is. I'm not too religious.

If I don't see anything coming I will take this patch as it is.

Andi

Re: [PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andy Shevchenko]

On Tue, Nov 05, 2024 at 04:11:37PM +0100, Andi Shyti wrote:
> On Tue, Nov 05, 2024 at 04:56:37PM +0200, Andy Shevchenko wrote:
> > On Tue, Nov 05, 2024 at 03:44:34PM +0100, Andi Shyti wrote:
> > > On Mon, Nov 04, 2024 at 12:39:14PM +0200, Andy Shevchenko wrote:
> > > > *-objs suffix is reserved rather for (user-space) host programs while
> > > > usually *-y suffix is used for kernel drivers (although *-objs works
> > > > for that purpose for now).
> > > > 
> > > > Let's correct the old usages of *-objs in Makefiles.

...

> > > >  config I2C_AT91_SLAVE_EXPERIMENTAL
> > > > -	tristate "Microchip AT91 I2C experimental slave mode"
> > > > +	bool "Microchip AT91 I2C experimental slave mode"
> > > >  	depends on I2C_AT91
> > > >  	select I2C_SLAVE
> > > >  	help
> > > > @@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
> > > >  	  been tested in a heavy way, help wanted.
> > > >  	  There are known bugs:
> > > >  	    - It can hang, on a SAMA5D4, after several transfers.
> > > > -	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
> > > > +	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
> > > 
> > > Although these changes are related and I'm OK also with the typo
> > > fix, could you please propose here a couple of lines that I can
> > > add to the commit message?
> > 
> > Would this work?
> > "While at it, fix an obvious typo in help section of the Kconfig."
> 
> works for me.
> 
> > Of course, feel free to drop that hunk or request for a new version without it
> > (or split into a separate change), I am fine with all options.
> > 
> > Note, bool is essential to for the patch, but can be split as a prerequisite,
> > but without this patch it doesn't really fix match as we never try to build
> > the code when it was =m.
> 
> As you wish, you can keep it in three patches or I can keep it
> as it is. I'm not too religious.
> 
> If I don't see anything coming I will take this patch as it is.

If you can take it as is (including the above mentioned add-on
to the commit message) it would be the best.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 1/1] i2c: busses: Use *-y instead of *-objs in Makefile

[Andi Shyti]

Hi Andy,

On Tue, Nov 05, 2024 at 05:42:27PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 05, 2024 at 04:11:37PM +0100, Andi Shyti wrote:
> > On Tue, Nov 05, 2024 at 04:56:37PM +0200, Andy Shevchenko wrote:
> > > On Tue, Nov 05, 2024 at 03:44:34PM +0100, Andi Shyti wrote:
> > > > On Mon, Nov 04, 2024 at 12:39:14PM +0200, Andy Shevchenko wrote:
> > > > > *-objs suffix is reserved rather for (user-space) host programs while
> > > > > usually *-y suffix is used for kernel drivers (although *-objs works
> > > > > for that purpose for now).
> > > > > 
> > > > > Let's correct the old usages of *-objs in Makefiles.
> 
> ...
> 
> > > > >  config I2C_AT91_SLAVE_EXPERIMENTAL
> > > > > -	tristate "Microchip AT91 I2C experimental slave mode"
> > > > > +	bool "Microchip AT91 I2C experimental slave mode"
> > > > >  	depends on I2C_AT91
> > > > >  	select I2C_SLAVE
> > > > >  	help
> > > > > @@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
> > > > >  	  been tested in a heavy way, help wanted.
> > > > >  	  There are known bugs:
> > > > >  	    - It can hang, on a SAMA5D4, after several transfers.
> > > > > -	    - There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
> > > > > +	    - There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
> > > > 
> > > > Although these changes are related and I'm OK also with the typo
> > > > fix, could you please propose here a couple of lines that I can
> > > > add to the commit message?
> > > 
> > > Would this work?
> > > "While at it, fix an obvious typo in help section of the Kconfig."
> > 
> > works for me.
> > 
> > > Of course, feel free to drop that hunk or request for a new version without it
> > > (or split into a separate change), I am fine with all options.
> > > 
> > > Note, bool is essential to for the patch, but can be split as a prerequisite,
> > > but without this patch it doesn't really fix match as we never try to build
> > > the code when it was =m.
> > 
> > As you wish, you can keep it in three patches or I can keep it
> > as it is. I'm not too religious.
> > 
> > If I don't see anything coming I will take this patch as it is.
> 
> If you can take it as is (including the above mentioned add-on
> to the commit message) it would be the best.

And merged to i2c/i2c-host.

Thanks,
Andi