[PATCH] x86/PCI: Add missing SPDX license header.

[PATCH] x86/PCI: Add missing SPDX license header.

[Krzysztof Wilczynski]

Add the missing "SPDX-License-Identifier" license header to the
arch/x86/pci/numachip.c.  Use GPL-2.0 identifier derived using
the comment mentioning license from the top of the file.

Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
---
 arch/x86/pci/numachip.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/pci/numachip.c b/arch/x86/pci/numachip.c
index 2e565e65c893..b73157e834e0 100644
--- a/arch/x86/pci/numachip.c
+++ b/arch/x86/pci/numachip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
-- 
2.22.0

Re: [PATCH] x86/PCI: Add missing SPDX license header.

[Bjorn Helgaas]

On Mon, Aug 19, 2019 at 08:06:24AM +0200, Krzysztof Wilczynski wrote:
> Add the missing "SPDX-License-Identifier" license header to the
> arch/x86/pci/numachip.c.  Use GPL-2.0 identifier derived using
> the comment mentioning license from the top of the file.
> 
> Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
> ---
>  arch/x86/pci/numachip.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/x86/pci/numachip.c b/arch/x86/pci/numachip.c
> index 2e565e65c893..b73157e834e0 100644
> --- a/arch/x86/pci/numachip.c
> +++ b/arch/x86/pci/numachip.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * This file is subject to the terms and conditions of the GNU General Public
>   * License.  See the file "COPYING" in the main directory of this archive

You can remove this license text at the same time as in 8cfab3cf63cf
("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

Re: [PATCH] x86/PCI: Add missing SPDX license header.

[Krzysztof Wilczynski]

Hello Bjorn,

Thank you for the feedback.

[...]
>>  +// SPDX-License-Identifier: GPL-2.0
>>   /*
>>    * This file is subject to the terms and conditions of the GNU 
>> General Public
>>    * License.  See the file "COPYING" in the main directory of this 
>> archive
> 
> You can remove this license text at the same time as in 8cfab3cf63cf
> ("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

Will do. I am going to send an updated v2 that takes care about this.

Krzysztof

[PATCH v2] x86/PCI: Correct warnings about missing or incorrect SPDX license headers.

[Krzysztof Wilczynski]

Add the missing "SPDX-License-Identifier" license header
to the arch/x86/pci/numachip.c (use the GPL-2.0 identifier
derived using the comment mentioning license from the
top of the file), and remove license boilerplate as per
a similar commit 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to
replace GPL v2 boilerplate").

Correct existing SPDX license header in the files
drivers/pci/controller/pcie-cadence.h and
drivers/pci/controller/pcie-rockchip.h to use
correct comment style as per the section 2 "Style"
of the "Linux kernel licensing rules" (see:
Documentation/process/license-rules.rst).

Both changes will resolve the following checkpatch.pl
script warning:

WARNING: Missing or malformed SPDX-License-Identifier tag in line 1

Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
---
Changes in v2:
  Update wording and mention checkpatch.pl script warnings.
  Add two C header files to which the fix also applies.

 arch/x86/pci/numachip.c                | 5 +----
 drivers/pci/controller/pcie-cadence.h  | 2 +-
 drivers/pci/controller/pcie-rockchip.h | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/pci/numachip.c b/arch/x86/pci/numachip.c
index 2e565e65c893..01a085d9135a 100644
--- a/arch/x86/pci/numachip.c
+++ b/arch/x86/pci/numachip.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  * Numascale NumaConnect-specific PCI code
  *
  * Copyright (C) 2012 Numascale AS. All rights reserved.
diff --git a/drivers/pci/controller/pcie-cadence.h b/drivers/pci/controller/pcie-cadence.h
index ae6bf2a2b3d3..f1cba3931b99 100644
--- a/drivers/pci/controller/pcie-cadence.h
+++ b/drivers/pci/controller/pcie-cadence.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 // Copyright (c) 2017 Cadence
 // Cadence PCIe controller driver.
 // Author: Cyrille Pitchen <cyrille.pitchen@free-electrons.com>
diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h
index 8e87a059ce73..53e4f9e59624 100644
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Rockchip AXI PCIe controller driver
  *
-- 
2.22.1

Re: [PATCH v2] x86/PCI: Correct warnings about missing or incorrect SPDX license headers.

[Bjorn Helgaas]

On Wed, Aug 28, 2019 at 03:53:22PM +0200, Krzysztof Wilczynski wrote:
> Add the missing "SPDX-License-Identifier" license header
> to the arch/x86/pci/numachip.c (use the GPL-2.0 identifier
> derived using the comment mentioning license from the
> top of the file), and remove license boilerplate as per
> a similar commit 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to
> replace GPL v2 boilerplate").
> 
> Correct existing SPDX license header in the files
> drivers/pci/controller/pcie-cadence.h and
> drivers/pci/controller/pcie-rockchip.h to use
> correct comment style as per the section 2 "Style"
> of the "Linux kernel licensing rules" (see:
> Documentation/process/license-rules.rst).
> 
> Both changes will resolve the following checkpatch.pl
> script warning:
> 
> WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
> 
> Signed-off-by: Krzysztof Wilczynski <kw@linux.com>

Applied to pci/misc for v5.5, thanks!

> ---
> Changes in v2:
>   Update wording and mention checkpatch.pl script warnings.
>   Add two C header files to which the fix also applies.
> 
>  arch/x86/pci/numachip.c                | 5 +----
>  drivers/pci/controller/pcie-cadence.h  | 2 +-
>  drivers/pci/controller/pcie-rockchip.h | 2 +-
>  3 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/pci/numachip.c b/arch/x86/pci/numachip.c
> index 2e565e65c893..01a085d9135a 100644
> --- a/arch/x86/pci/numachip.c
> +++ b/arch/x86/pci/numachip.c
> @@ -1,8 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License.  See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
>   * Numascale NumaConnect-specific PCI code
>   *
>   * Copyright (C) 2012 Numascale AS. All rights reserved.
> diff --git a/drivers/pci/controller/pcie-cadence.h b/drivers/pci/controller/pcie-cadence.h
> index ae6bf2a2b3d3..f1cba3931b99 100644
> --- a/drivers/pci/controller/pcie-cadence.h
> +++ b/drivers/pci/controller/pcie-cadence.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +/* SPDX-License-Identifier: GPL-2.0 */
>  // Copyright (c) 2017 Cadence
>  // Cadence PCIe controller driver.
>  // Author: Cyrille Pitchen <cyrille.pitchen@free-electrons.com>
> diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h
> index 8e87a059ce73..53e4f9e59624 100644
> --- a/drivers/pci/controller/pcie-rockchip.h
> +++ b/drivers/pci/controller/pcie-rockchip.h
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: GPL-2.0+ */
>  /*
>   * Rockchip AXI PCIe controller driver
>   *
> -- 
> 2.22.1
>