* [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
@ 2021-01-30 3:45 Ilya Lipnitskiy
2021-02-02 6:54 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Ilya Lipnitskiy @ 2021-01-30 3:45 UTC (permalink / raw)
To: Greg Kroah-Hartman, Matthias Brugger
Cc: devel, Masahiro Yamada, Ilya Lipnitskiy, linux-mediatek, stable
Also use KBUILD_MODNAME for module name.
This driver is only used by RALINK MIPS MT7621 SoCs. Tested by building
against that target using OpenWrt with Linux 5.10.10.
Fixes the following error:
error: the following would cause module name conflict:
drivers/dma/mediatek/mtk-hsdma.ko
drivers/staging/mt7621-dma/mtk-hsdma.ko
Cc: stable@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
---
drivers/staging/mt7621-dma/Makefile | 2 +-
drivers/staging/mt7621-dma/{mtk-hsdma.c => hsdma-mt7621.c} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/staging/mt7621-dma/{mtk-hsdma.c => hsdma-mt7621.c} (99%)
diff --git a/drivers/staging/mt7621-dma/Makefile b/drivers/staging/mt7621-dma/Makefile
index 66da1bf10c32..23256d1286f3 100644
--- a/drivers/staging/mt7621-dma/Makefile
+++ b/drivers/staging/mt7621-dma/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o
+obj-$(CONFIG_MTK_HSDMA) += hsdma-mt7621.o
ccflags-y += -I$(srctree)/drivers/dma
diff --git a/drivers/staging/mt7621-dma/mtk-hsdma.c b/drivers/staging/mt7621-dma/hsdma-mt7621.c
similarity index 99%
rename from drivers/staging/mt7621-dma/mtk-hsdma.c
rename to drivers/staging/mt7621-dma/hsdma-mt7621.c
index bc4bb4374313..b0ed935de7ac 100644
--- a/drivers/staging/mt7621-dma/mtk-hsdma.c
+++ b/drivers/staging/mt7621-dma/hsdma-mt7621.c
@@ -749,7 +749,7 @@ static struct platform_driver mtk_hsdma_driver = {
.probe = mtk_hsdma_probe,
.remove = mtk_hsdma_remove,
.driver = {
- .name = "hsdma-mt7621",
+ .name = KBUILD_MODNAME,
.of_match_table = mtk_hsdma_of_match,
},
};
--
2.30.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
2021-01-30 3:45 [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c Ilya Lipnitskiy
@ 2021-02-02 6:54 ` Dan Carpenter
2021-02-02 8:31 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2021-02-02 6:54 UTC (permalink / raw)
To: Ilya Lipnitskiy
Cc: devel, Greg Kroah-Hartman, Masahiro Yamada, stable,
linux-mediatek, Matthias Brugger
On Fri, Jan 29, 2021 at 07:45:07PM -0800, Ilya Lipnitskiy wrote:
> Also use KBUILD_MODNAME for module name.
>
> This driver is only used by RALINK MIPS MT7621 SoCs. Tested by building
> against that target using OpenWrt with Linux 5.10.10.
>
> Fixes the following error:
> error: the following would cause module name conflict:
> drivers/dma/mediatek/mtk-hsdma.ko
> drivers/staging/mt7621-dma/mtk-hsdma.ko
>
The only part of this commit message that I could understand at all was
the parts which were copy and pasted from the build system... :/
Please, write it like this:
[PATCH] staging/mt7621-dma: fix build conflict
This driver cannot be built because we have two modules with the same
name and it leads to an error:
error: the following would cause module name conflict:
drivers/dma/mediatek/mtk-hsdma.ko
drivers/staging/mt7621-dma/mtk-hsdma.ko
The fix is to rename mtk-hsdma.c to hsdma-mt7621.c. Also we can use the
KBUILD_MODNAME where appropriate instead of hard coding the name.
regards,
dan carpenter
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
2021-02-02 6:54 ` Dan Carpenter
@ 2021-02-02 8:31 ` Dan Carpenter
2021-02-02 11:09 ` Greg Kroah-Hartman
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2021-02-02 8:31 UTC (permalink / raw)
To: Ilya Lipnitskiy
Cc: devel, Greg Kroah-Hartman, Masahiro Yamada, stable,
linux-mediatek, Matthias Brugger
Apparently this was already merged? Never mind then. Once it's merged
it can't be changed. No big stress...
regards,
dan carpenter
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
2021-02-02 8:31 ` Dan Carpenter
@ 2021-02-02 11:09 ` Greg Kroah-Hartman
0 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2021-02-02 11:09 UTC (permalink / raw)
To: Dan Carpenter
Cc: devel, Ilya Lipnitskiy, Masahiro Yamada, stable, linux-mediatek,
Matthias Brugger
On Tue, Feb 02, 2021 at 11:31:17AM +0300, Dan Carpenter wrote:
> Apparently this was already merged? Never mind then. Once it's merged
> it can't be changed. No big stress...
Sorry, yes, already in my tree...
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-02 11:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-30 3:45 [PATCH] staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c Ilya Lipnitskiy
2021-02-02 6:54 ` Dan Carpenter
2021-02-02 8:31 ` Dan Carpenter
2021-02-02 11:09 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).