]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Sat, 30 Jan 2021 03:45:07 +0000 (19:45 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 Jan 2021 12:39:53 +0000 (13:39 +0100)
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>
Link: https://lore.kernel.org/r/20210130034507.2115280-1-ilya.lipnitskiy@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/mt7621-dma/Makefile
drivers/staging/mt7621-dma/hsdma-mt7621.c [moved from drivers/staging/mt7621-dma/mtk-hsdma.c with 99% similarity]

index 66da1bf10c32e9260b448e6d276be316595eb8d9..23256d1286f3eb10f9f944c3c0b9e95e7d2ee938 100644 (file)
@@ -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
similarity index 99%
rename from drivers/staging/mt7621-dma/mtk-hsdma.c
rename to drivers/staging/mt7621-dma/hsdma-mt7621.c
index bc4bb43743131d01c8b2a95d3e3dec096a06bb2c..b0ed935de7acc686b074177e502d7b6b16149580 100644 (file)
@@ -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,
        },
 };