[PATCH 0/2] ALSA: firewire: use 'GPL' string for module license

[PATCH 0/2] ALSA: firewire: use 'GPL' string for module license

[Takashi Sakamoto]

Hi,

Nowadays, the use of "GPL" string in MODULE_LICENSE macro seems to
obsolete "GPL v2" string. This series includes two patches to use it for
modules in ALSA firewire stack contributed by two developers.

This change does not pose any issue for modules contributed by Takashi
Sakamoto, the author of this series, while it is advisable to have careful
consideration for modules contributed by Clemens Ladisch, since the code
related to license will be modified by a developer who is not the
copyright holder.

A commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs.
"GPL v2" bogosity") adds detail documentation about the macro itself and
clarifies the difference between "GPL" and "GPL v2". The macro is designed
to provide sufficient information to kernel module loader and user space
tools. Both strings have the same meanings, but the latter is legacy.

In conclusion, any change made to the usage of the macro neither result in
significant alterations to license nor copyright.

Takashi Sakamoto (2):
  ALSA: firewire: use 'GPL' string for module license contributed by
    Takashi Sakamoto
  ALSA: firewire: use 'GPL' string for module license contributed by
    Clemens Ladisch

 sound/firewire/bebob/bebob.c         | 2 +-
 sound/firewire/dice/dice.c           | 2 +-
 sound/firewire/digi00x/digi00x.c     | 2 +-
 sound/firewire/fireface/ff.c         | 2 +-
 sound/firewire/fireworks/fireworks.c | 2 +-
 sound/firewire/isight.c              | 2 +-
 sound/firewire/lib.c                 | 2 +-
 sound/firewire/motu/motu.c           | 2 +-
 sound/firewire/oxfw/oxfw.c           | 2 +-
 sound/firewire/tascam/tascam.c       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

-- 
2.39.2

[PATCH 1/2] ALSA: firewire: use 'GPL' string for module license contributed by Takashi Sakamoto

[Takashi Sakamoto]

In MODULE_LICENSE macro, "GPL" string obsoletes "GPL v2" string by a
commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs. "GPL v2"
bogosity").

This commit uses the preferable expression.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/bebob/bebob.c         | 2 +-
 sound/firewire/digi00x/digi00x.c     | 2 +-
 sound/firewire/fireface/ff.c         | 2 +-
 sound/firewire/fireworks/fireworks.c | 2 +-
 sound/firewire/motu/motu.c           | 2 +-
 sound/firewire/tascam/tascam.c       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 06a7ced218e2..2ba5962beb30 100644
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -15,7 +15,7 @@
 
 MODULE_DESCRIPTION("BridgeCo BeBoB driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 static int index[SNDRV_CARDS]	= SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS]	= SNDRV_DEFAULT_STR;
diff --git a/sound/firewire/digi00x/digi00x.c b/sound/firewire/digi00x/digi00x.c
index 995302808c27..704ae2a5316b 100644
--- a/sound/firewire/digi00x/digi00x.c
+++ b/sound/firewire/digi00x/digi00x.c
@@ -9,7 +9,7 @@
 
 MODULE_DESCRIPTION("Digidesign Digi 002/003 family Driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 #define VENDOR_DIGIDESIGN	0x00a07e
 #define MODEL_CONSOLE		0x000001
diff --git a/sound/firewire/fireface/ff.c b/sound/firewire/fireface/ff.c
index 448e972028d9..82241058ea14 100644
--- a/sound/firewire/fireface/ff.c
+++ b/sound/firewire/fireface/ff.c
@@ -11,7 +11,7 @@
 
 MODULE_DESCRIPTION("RME Fireface series Driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 static void name_card(struct snd_ff *ff)
 {
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
index ffb6dd796243..dd4298876ac0 100644
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -18,7 +18,7 @@
 
 MODULE_DESCRIPTION("Echo Fireworks driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 static int index[SNDRV_CARDS]	= SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS]	= SNDRV_DEFAULT_STR;
diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c
index f8b7fe38751c..d73599eb7d5a 100644
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
@@ -11,7 +11,7 @@
 
 MODULE_DESCRIPTION("MOTU FireWire driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 const unsigned int snd_motu_clock_rates[SND_MOTU_CLOCK_RATE_COUNT] = {
 	/* mode 0 */
diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c
index eb58d3fcf087..86880089de28 100644
--- a/sound/firewire/tascam/tascam.c
+++ b/sound/firewire/tascam/tascam.c
@@ -9,7 +9,7 @@
 
 MODULE_DESCRIPTION("TASCAM FireWire series Driver");
 MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 static const struct snd_tscm_spec model_specs[] = {
 	{
-- 
2.39.2

[PATCH 2/2] ALSA: firewire: use 'GPL' string for module license contributed by Clemens Ladisch

[Takashi Sakamoto]

In MODULE_LICENSE macro, "GPL" string obsoletes "GPL v2" string by a
commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs. "GPL v2"
bogosity").

This commit uses the preferable expression.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/dice/dice.c | 2 +-
 sound/firewire/isight.c    | 2 +-
 sound/firewire/lib.c       | 2 +-
 sound/firewire/oxfw/oxfw.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c
index 6036a5edbcb8..6c93e6e4982c 100644
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
@@ -9,7 +9,7 @@
 
 MODULE_DESCRIPTION("DICE driver");
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 #define OUI_WEISS		0x001c6a
 #define OUI_LOUD		0x000ff2
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index 6655af53b367..806f82c9ceee 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -77,7 +77,7 @@ struct audio_payload {
 
 MODULE_DESCRIPTION("iSight audio driver");
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 
 static struct fw_iso_packet audio_packet = {
 	.payload_length = sizeof(struct audio_payload),
diff --git a/sound/firewire/lib.c b/sound/firewire/lib.c
index e0a2337e8f27..654e1a6050a9 100644
--- a/sound/firewire/lib.c
+++ b/sound/firewire/lib.c
@@ -69,4 +69,4 @@ EXPORT_SYMBOL(snd_fw_transaction);
 
 MODULE_DESCRIPTION("FireWire audio helper functions");
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index b496f87841ae..9523479fa94a 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -32,7 +32,7 @@
 
 MODULE_DESCRIPTION("Oxford Semiconductor FW970/971 driver");
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_ALIAS("snd-firewire-speakers");
 MODULE_ALIAS("snd-scs1x");
 
-- 
2.39.2

Re: [PATCH 0/2] ALSA: firewire: use 'GPL' string for module license

[Takashi Iwai]

On Sun, 11 Jun 2023 16:44:43 +0200,
Takashi Sakamoto wrote:
> 
> Hi,
> 
> Nowadays, the use of "GPL" string in MODULE_LICENSE macro seems to
> obsolete "GPL v2" string. This series includes two patches to use it for
> modules in ALSA firewire stack contributed by two developers.
> 
> This change does not pose any issue for modules contributed by Takashi
> Sakamoto, the author of this series, while it is advisable to have careful
> consideration for modules contributed by Clemens Ladisch, since the code
> related to license will be modified by a developer who is not the
> copyright holder.
> 
> A commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs.
> "GPL v2" bogosity") adds detail documentation about the macro itself and
> clarifies the difference between "GPL" and "GPL v2". The macro is designed
> to provide sufficient information to kernel module loader and user space
> tools. Both strings have the same meanings, but the latter is legacy.
> 
> In conclusion, any change made to the usage of the macro neither result in
> significant alterations to license nor copyright.
> 
> Takashi Sakamoto (2):
>   ALSA: firewire: use 'GPL' string for module license contributed by
>     Takashi Sakamoto
>   ALSA: firewire: use 'GPL' string for module license contributed by
>     Clemens Ladisch

Applied now.  Thanks.


Takashi