[v2] {tty: serial, nand: onenand}: samsung: rename to fix build warning
diff mbox series

Message ID 20191117202435.28127-1-sudipm.mukherjee@gmail.com
State New
Headers show
Series
  • [v2] {tty: serial, nand: onenand}: samsung: rename to fix build warning
Related show

Commit Message

Sudip Mukherjee Nov. 17, 2019, 8:24 p.m. UTC
Any arm config which has 'CONFIG_MTD_ONENAND_SAMSUNG=m' and
'CONFIG_SERIAL_SAMSUNG=m' gives a build warning:

warning: same module names found:
  drivers/tty/serial/samsung.ko
  drivers/mtd/nand/onenand/samsung.ko

Rename both drivers/tty/serial/samsung.c to
drivers/tty/serial/samsung_tty.c and drivers/mtd/nand/onenand/samsung.c
drivers/mtd/nand/onenand/samsung_mtd.c to fix the warning.

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---

v1: only renamed drivers/tty/serial/samsung.c
link: https://lore.kernel.org/lkml/20191018194707.27188-1-sudipm.mukherjee@gmail.com

v2: rename both files.

I was not sure if this should have been two different patch, but since
this will be fixing the same problem so it seems its better to have them
in a single patch.

 drivers/mtd/nand/onenand/Makefile                     | 2 +-
 drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
 drivers/tty/serial/Makefile                           | 2 +-
 drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
 rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)

Comments

Greg KH Nov. 18, 2019, 11:46 a.m. UTC | #1
On Sun, Nov 17, 2019 at 08:24:35PM +0000, Sudip Mukherjee wrote:
> Any arm config which has 'CONFIG_MTD_ONENAND_SAMSUNG=m' and
> 'CONFIG_SERIAL_SAMSUNG=m' gives a build warning:
> 
> warning: same module names found:
>   drivers/tty/serial/samsung.ko
>   drivers/mtd/nand/onenand/samsung.ko
> 
> Rename both drivers/tty/serial/samsung.c to
> drivers/tty/serial/samsung_tty.c and drivers/mtd/nand/onenand/samsung.c
> drivers/mtd/nand/onenand/samsung_mtd.c to fix the warning.
> 
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
> 
> v1: only renamed drivers/tty/serial/samsung.c
> link: https://lore.kernel.org/lkml/20191018194707.27188-1-sudipm.mukherjee@gmail.com
> 
> v2: rename both files.
> 
> I was not sure if this should have been two different patch, but since
> this will be fixing the same problem so it seems its better to have them
> in a single patch.
> 
>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
>  drivers/tty/serial/Makefile                           | 2 +-
>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
>  4 files changed, 2 insertions(+), 2 deletions(-)
>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)

I can take this in the tty tree if the mtd maintainer gives an ack for
it...
Richard Weinberger Nov. 18, 2019, 12:47 p.m. UTC | #2
----- Ursprüngliche Mail -----
>> I was not sure if this should have been two different patch, but since
>> this will be fixing the same problem so it seems its better to have them
>> in a single patch.
>> 
>>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
>>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
>>  drivers/tty/serial/Makefile                           | 2 +-
>>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
>>  4 files changed, 2 insertions(+), 2 deletions(-)
>>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
>>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)
> 
> I can take this in the tty tree if the mtd maintainer gives an ack for
> it...

Acked-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard
Miquel Raynal Nov. 18, 2019, 7:22 p.m. UTC | #3
Hi all,

Richard Weinberger <richard@nod.at> wrote on Mon, 18 Nov 2019 13:47:50
+0100 (CET):

> ----- Ursprüngliche Mail -----
> >> I was not sure if this should have been two different patch, but since
> >> this will be fixing the same problem so it seems its better to have them
> >> in a single patch.
> >> 
> >>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
> >>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
> >>  drivers/tty/serial/Makefile                           | 2 +-
> >>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
> >>  4 files changed, 2 insertions(+), 2 deletions(-)
> >>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
> >>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)  
> > 
> > I can take this in the tty tree if the mtd maintainer gives an ack for
> > it...  
> 
> Acked-by: Richard Weinberger <richard@nod.at>

If it is not too late, I am not a big fan of the new naming which is
rather not descriptive. Files in the onenand subdirectory are:
* onenand_<something>.c for the base files
* <vendor>.c for the vendors files (currently: omap2.c and samsung.c).

What about doing the MTD changes in a single patch and renaming both
vendor drivers (for the same reason): onenand_omap2.c and
onenand_samsung.c? I know it makes git blaming more difficult though.

Thanks,
Miquèl
Richard Weinberger Nov. 18, 2019, 7:31 p.m. UTC | #4
----- Ursprüngliche Mail -----
> Von: "Miquel Raynal" <miquel.raynal@bootlin.com>
> An: "richard" <richard@nod.at>
> CC: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Sudip Mukherjee" <sudipm.mukherjee@gmail.com>, "Kyungmin Park"
> <kyungmin.park@samsung.com>, "Vignesh Raghavendra" <vigneshr@ti.com>, "Jiri Slaby" <jslaby@suse.com>, "linux-kernel"
> <linux-kernel@vger.kernel.org>, "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-serial"
> <linux-serial@vger.kernel.org>
> Gesendet: Montag, 18. November 2019 20:22:57
> Betreff: Re: [PATCH v2] {tty: serial, nand: onenand}: samsung: rename to fix build warning

> Hi all,
> 
> Richard Weinberger <richard@nod.at> wrote on Mon, 18 Nov 2019 13:47:50
> +0100 (CET):
> 
>> ----- Ursprüngliche Mail -----
>> >> I was not sure if this should have been two different patch, but since
>> >> this will be fixing the same problem so it seems its better to have them
>> >> in a single patch.
>> >> 
>> >>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
>> >>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
>> >>  drivers/tty/serial/Makefile                           | 2 +-
>> >>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
>> >>  4 files changed, 2 insertions(+), 2 deletions(-)
>> >>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
>> >>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)
>> > 
>> > I can take this in the tty tree if the mtd maintainer gives an ack for
>> > it...
>> 
>> Acked-by: Richard Weinberger <richard@nod.at>
> 
> If it is not too late, I am not a big fan of the new naming which is
> rather not descriptive. Files in the onenand subdirectory are:
> * onenand_<something>.c for the base files
> * <vendor>.c for the vendors files (currently: omap2.c and samsung.c).

Well, I'm fine with the naming either way. :-)

Thanks,
//richard
Greg KH Nov. 18, 2019, 7:40 p.m. UTC | #5
On Mon, Nov 18, 2019 at 08:31:44PM +0100, Richard Weinberger wrote:
> ----- Ursprüngliche Mail -----
> > Von: "Miquel Raynal" <miquel.raynal@bootlin.com>
> > An: "richard" <richard@nod.at>
> > CC: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Sudip Mukherjee" <sudipm.mukherjee@gmail.com>, "Kyungmin Park"
> > <kyungmin.park@samsung.com>, "Vignesh Raghavendra" <vigneshr@ti.com>, "Jiri Slaby" <jslaby@suse.com>, "linux-kernel"
> > <linux-kernel@vger.kernel.org>, "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-serial"
> > <linux-serial@vger.kernel.org>
> > Gesendet: Montag, 18. November 2019 20:22:57
> > Betreff: Re: [PATCH v2] {tty: serial, nand: onenand}: samsung: rename to fix build warning
> 
> > Hi all,
> > 
> > Richard Weinberger <richard@nod.at> wrote on Mon, 18 Nov 2019 13:47:50
> > +0100 (CET):
> > 
> >> ----- Ursprüngliche Mail -----
> >> >> I was not sure if this should have been two different patch, but since
> >> >> this will be fixing the same problem so it seems its better to have them
> >> >> in a single patch.
> >> >> 
> >> >>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
> >> >>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
> >> >>  drivers/tty/serial/Makefile                           | 2 +-
> >> >>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
> >> >>  4 files changed, 2 insertions(+), 2 deletions(-)
> >> >>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
> >> >>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)
> >> > 
> >> > I can take this in the tty tree if the mtd maintainer gives an ack for
> >> > it...
> >> 
> >> Acked-by: Richard Weinberger <richard@nod.at>
> > 
> > If it is not too late, I am not a big fan of the new naming which is
> > rather not descriptive. Files in the onenand subdirectory are:
> > * onenand_<something>.c for the base files
> > * <vendor>.c for the vendors files (currently: omap2.c and samsung.c).
> 
> Well, I'm fine with the naming either way. :-)

If you want to rename the mtd driver later, that's fine, I'll take this
for now for 5.5-rc1 and you all can bikeshed it for 5.5-final :)

thanks,

greg k-h
Miquel Raynal Nov. 20, 2019, 9:03 a.m. UTC | #6
Hi Greg,

Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote on Mon, 18 Nov
2019 20:40:10 +0100:

> On Mon, Nov 18, 2019 at 08:31:44PM +0100, Richard Weinberger wrote:
> > ----- Ursprüngliche Mail -----  
> > > Von: "Miquel Raynal" <miquel.raynal@bootlin.com>
> > > An: "richard" <richard@nod.at>
> > > CC: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Sudip Mukherjee" <sudipm.mukherjee@gmail.com>, "Kyungmin Park"
> > > <kyungmin.park@samsung.com>, "Vignesh Raghavendra" <vigneshr@ti.com>, "Jiri Slaby" <jslaby@suse.com>, "linux-kernel"
> > > <linux-kernel@vger.kernel.org>, "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-serial"
> > > <linux-serial@vger.kernel.org>
> > > Gesendet: Montag, 18. November 2019 20:22:57
> > > Betreff: Re: [PATCH v2] {tty: serial, nand: onenand}: samsung: rename to fix build warning  
> >   
> > > Hi all,
> > > 
> > > Richard Weinberger <richard@nod.at> wrote on Mon, 18 Nov 2019 13:47:50
> > > +0100 (CET):
> > >   
> > >> ----- Ursprüngliche Mail -----  
> > >> >> I was not sure if this should have been two different patch, but since
> > >> >> this will be fixing the same problem so it seems its better to have them
> > >> >> in a single patch.
> > >> >> 
> > >> >>  drivers/mtd/nand/onenand/Makefile                     | 2 +-
> > >> >>  drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} | 0
> > >> >>  drivers/tty/serial/Makefile                           | 2 +-
> > >> >>  drivers/tty/serial/{samsung.c => samsung_tty.c}       | 0
> > >> >>  4 files changed, 2 insertions(+), 2 deletions(-)
> > >> >>  rename drivers/mtd/nand/onenand/{samsung.c => samsung_mtd.c} (100%)
> > >> >>  rename drivers/tty/serial/{samsung.c => samsung_tty.c} (100%)  
> > >> > 
> > >> > I can take this in the tty tree if the mtd maintainer gives an ack for
> > >> > it...  
> > >> 
> > >> Acked-by: Richard Weinberger <richard@nod.at>  
> > > 
> > > If it is not too late, I am not a big fan of the new naming which is
> > > rather not descriptive. Files in the onenand subdirectory are:
> > > * onenand_<something>.c for the base files
> > > * <vendor>.c for the vendors files (currently: omap2.c and samsung.c).  
> > 
> > Well, I'm fine with the naming either way. :-)  
> 
> If you want to rename the mtd driver later, that's fine, I'll take this
> for now for 5.5-rc1 and you all can bikeshed it for 5.5-final :)

Let's not rename it twice, if nobody want's another naming I'm fine
with this one.

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>

Cheers!
Miquèl

Patch
diff mbox series

diff --git a/drivers/mtd/nand/onenand/Makefile b/drivers/mtd/nand/onenand/Makefile
index f8b624aca9cc..a27b635eb23a 100644
--- a/drivers/mtd/nand/onenand/Makefile
+++ b/drivers/mtd/nand/onenand/Makefile
@@ -9,6 +9,6 @@  obj-$(CONFIG_MTD_ONENAND)		+= onenand.o
 # Board specific.
 obj-$(CONFIG_MTD_ONENAND_GENERIC)	+= generic.o
 obj-$(CONFIG_MTD_ONENAND_OMAP2)		+= omap2.o
-obj-$(CONFIG_MTD_ONENAND_SAMSUNG)       += samsung.o
+obj-$(CONFIG_MTD_ONENAND_SAMSUNG)       += samsung_mtd.o
 
 onenand-objs = onenand_base.o onenand_bbt.o
diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung_mtd.c
similarity index 100%
rename from drivers/mtd/nand/onenand/samsung.c
rename to drivers/mtd/nand/onenand/samsung_mtd.c
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 863f47056539..d056ee6cca33 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -30,7 +30,7 @@  obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o
 obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
 obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
-obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
+obj-$(CONFIG_SERIAL_SAMSUNG) += samsung_tty.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_MAX310X) += max310x.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung_tty.c
similarity index 100%
rename from drivers/tty/serial/samsung.c
rename to drivers/tty/serial/samsung_tty.c