Skip to contentSkip to conversation

usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

PATCH In review Marcus Folkesson 3 participants 4 messages Sep 2, 2018 – Sep 3, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

The SPDX-License-Identifier is set to GPL-2.0+, which correspond to MODULE_LICENSE "GPL".

---
 drivers/usb/chipidea/ci_hdrc_imx.c | 2 +-
 drivers/usb/chipidea/usbmisc_imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +1 -1
index 19f5f5f2a48a..555d398fbfa7 100644
@@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver = {
 module_platform_driver(ci_hdrc_imx_driver);
 
 MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
 MODULE_AUTHOR("Marek Vasut <[email protected]>");
 MODULE_AUTHOR("Richard Zhao <[email protected]>");
drivers/usb/chipidea/usbmisc_imx.c +1 -1
index 34ad5bf8acd8..d9cfa00b8a6c 100644
@@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver = {
 module_platform_driver(usbmisc_imx_driver);
 
 MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("driver for imx usb non-core registers");
 MODULE_AUTHOR("Richard Zhao <[email protected]>");
#1 lore raw
Quoted 27 lines

The SPDX-License-Identifier is set to GPL-2.0+, which correspond to MODULE_LICENSE "GPL".

---
 drivers/usb/chipidea/ci_hdrc_imx.c | 2 +-  drivers/usb/chipidea/usbmisc_imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +1 -1
index 19f5f5f2a48a..555d398fbfa7 100644
@@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
 {  module_platform_driver(ci_hdrc_imx_driver);
 
 MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
 MODULE_AUTHOR("Marek Vasut <[email protected]>");

MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 34ad5bf8acd8..d9cfa00b8a6c 100644

drivers/usb/chipidea/usbmisc_imx.c static struct platform_driver usbmisc_imx_driver = · line 638

Quoted 7 lines
drivers/usb/chipidea/usbmisc_imx.c +1 -1
@@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
 {  module_platform_driver(usbmisc_imx_driver);
 
 MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("driver for imx usb non-core registers");
 MODULE_AUTHOR("Richard Zhao <[email protected]>");

Greg, does this is a useful change? I am not sure.

Peter

#2 lore raw
Quoted 30 lines · Peter Chen
Quoted 30 lines

The SPDX-License-Identifier is set to GPL-2.0+, which correspond to MODULE_LICENSE "GPL".

---
 drivers/usb/chipidea/ci_hdrc_imx.c | 2 +-  drivers/usb/chipidea/usbmisc_imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +1 -1
index 19f5f5f2a48a..555d398fbfa7 100644
@@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
 {  module_platform_driver(ci_hdrc_imx_driver);
 
 MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
 MODULE_AUTHOR("Marek Vasut <[email protected]>");

MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 34ad5bf8acd8..d9cfa00b8a6c 100644

drivers/usb/chipidea/usbmisc_imx.c +0 -0
@@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
 {  module_platform_driver(usbmisc_imx_driver);
 
Quoted 7 lines

drivers/usb/chipidea/usbmisc_imx.c static struct platform_driver usbmisc_imx_driver = { · line 638

Quoted 5 lines
drivers/usb/chipidea/usbmisc_imx.c +1 -1
 MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("driver for imx usb non-core registers");
 MODULE_AUTHOR("Richard Zhao <[email protected]>");

Greg, does this is a useful change? I am not sure.

As the two licenses are not matching, something needs to be fixed here, don't you agree?

Please read include/linux/modules.h for what the strings mean, that should help explain things more.

greg k-h

#3 lore raw

Hi,

Quoted 39 lines · Greg Kroah-Hartman
Quoted 30 lines · Peter Chen
Quoted 30 lines

The SPDX-License-Identifier is set to GPL-2.0+, which correspond to MODULE_LICENSE "GPL".

---
 drivers/usb/chipidea/ci_hdrc_imx.c | 2 +-  drivers/usb/chipidea/usbmisc_imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +1 -1
index 19f5f5f2a48a..555d398fbfa7 100644
@@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
 {  module_platform_driver(ci_hdrc_imx_driver);
 
 MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
 MODULE_AUTHOR("Marek Vasut <[email protected]>");

MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 34ad5bf8acd8..d9cfa00b8a6c 100644

drivers/usb/chipidea/usbmisc_imx.c +0 -0
@@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
 {  module_platform_driver(usbmisc_imx_driver);
 
Quoted 7 lines

drivers/usb/chipidea/usbmisc_imx.c static struct platform_driver usbmisc_imx_driver = { · line 638

Quoted 5 lines
drivers/usb/chipidea/usbmisc_imx.c +1 -1
 MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("driver for imx usb non-core registers");
 MODULE_AUTHOR("Richard Zhao <[email protected]>");

Greg, does this is a useful change? I am not sure.

Quoted 2 lines

As the two licenses are not matching, something needs to be fixed here, don't you agree?

I just want to fill in that the former license text (removed in 51b751f112dcbb24b46051fe64c2ddbe8aa367ea) was:

- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:

According to this, the SPDX-identifier is valid and the MODULE_LICENSE should be fixed.

Quoted 5 lines

Please read include/linux/modules.h for what the strings mean, that should help explain things more.

greg k-h

Best regards
Marcus Folkesson