ALSA: firewire: use KBUILD_MODNAME for struct driver.name instead of string

KBUILD_MODNAME is available to name kernel modules according to its object
name. This commit uses the macro instead of string for name field of
struct driver since drivers in ALSA firewire stack have the same name of
each object name.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200306135229.11659-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 976d8cb..2c8e339 100644 (file)
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -509,7 +509,7 @@ MODULE_DEVICE_TABLE(ieee1394, bebob_id_table);
 static struct fw_driver bebob_driver = {
        .driver = {
                .owner  = THIS_MODULE,
-               .name   = "snd-bebob",
+               .name   = KBUILD_MODNAME,
                .bus    = &fw_bus_type,
        },
        .probe    = bebob_probe,

diff --git a/sound/firewire/digi00x/digi00x.c b/sound/firewire/digi00x/digi00x.c
index 1f5fc0e..c84b913 100644 (file)
--- a/sound/firewire/digi00x/digi00x.c
+++ b/sound/firewire/digi00x/digi00x.c
@@ -192,7 +192,7 @@ MODULE_DEVICE_TABLE(ieee1394, snd_dg00x_id_table);
 static struct fw_driver dg00x_driver = {
        .driver = {
                .owner = THIS_MODULE,
-               .name = "snd-firewire-digi00x",
+               .name = KBUILD_MODNAME,
                .bus = &fw_bus_type,
        },
        .probe    = snd_dg00x_probe,

diff --git a/sound/firewire/fireface/ff.c b/sound/firewire/fireface/ff.c
index f5a0165..b62a4fd 100644 (file)
--- a/sound/firewire/fireface/ff.c
+++ b/sound/firewire/fireface/ff.c
@@ -224,7 +224,7 @@ MODULE_DEVICE_TABLE(ieee1394, snd_ff_id_table);
 static struct fw_driver ff_driver = {
        .driver = {
                .owner  = THIS_MODULE,
-               .name   = "snd-fireface",
+               .name   = KBUILD_MODNAME,
                .bus    = &fw_bus_type,
        },
        .probe    = snd_ff_probe,

diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
index 134fc9e..b1cc013 100644 (file)
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -362,7 +362,7 @@ MODULE_DEVICE_TABLE(ieee1394, efw_id_table);
 static struct fw_driver efw_driver = {
        .driver = {
                .owner = THIS_MODULE,
-               .name = "snd-fireworks",
+               .name = KBUILD_MODNAME,
                .bus = &fw_bus_type,
        },
        .probe    = efw_probe,

diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c
index addc464..5dac0d9 100644 (file)
--- a/sound/firewire/tascam/tascam.c
+++ b/sound/firewire/tascam/tascam.c
@@ -224,7 +224,7 @@ MODULE_DEVICE_TABLE(ieee1394, snd_tscm_id_table);
 static struct fw_driver tscm_driver = {
        .driver = {
                .owner = THIS_MODULE,
-               .name = "snd-firewire-tascam",
+               .name = KBUILD_MODNAME,
                .bus = &fw_bus_type,
        },
        .probe    = snd_tscm_probe,