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 976d8cb9a34f0791e1ee6489be3fa52ea0f8b76b..2c8e3392a4903a129acc28ecb9d21ffc698eae18 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 1f5fc0e7c02439c0cde7e6138d6dae09c2176dd6..c84b913a9fe010d391740c14013ed743fcf584df 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 f5a016560eb8e7a817fb707523699819d9ec9134..b62a4fd22407623008ca3220d0a4307cb838f470 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 134fc9ee26b90f66a7f163cf46af4f9828a30d7b..b1cc013a354094e8f61cd4f1711d90a1b6b43daa 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 addc464503bcf717e43be4c7319d964fcf60ae46..5dac0d9fc58e513c9d5de58c81e6c382a056c411 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,