| Message ID | 20230823085546.116494-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pinctrl: use capital "OR" for multiple licenses in SPDX | expand |
On 23/08/2023 10:55, Krzysztof Kozlowski wrote: > Documentation/process/license-rules.rst and checkpatch expect the SPDX > identifier syntax for multiple licenses to use capital "OR". Correct it > to keep consistent format and avoid copy-paste issues. > > Correct also the placement of SPDX identifier in pinctrl-meson-axg > files: > > WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 +-- > drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +- > drivers/pinctrl/meson/pinctrl-meson-axg.c | 3 +-- > drivers/pinctrl/meson/pinctrl-meson-g12a.c | 2 +- > drivers/pinctrl/pinctrl-mlxbf3.c | 2 +- > 5 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c > index 80c43683c789..ae3f8d0da05f 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c > +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Second generation of pinmux driver for Amlogic Meson-AXG SoC. > * > @@ -6,8 +7,6 @@ > * > * Copyright (c) 2017 Amlogic, Inc. All rights reserved. > * Author: Xingyu Chen <xingyu.chen@amlogic.com> > - * > - * SPDX-License-Identifier: (GPL-2.0+ or MIT) > */ > > /* > diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h > index aa79d7ecee00..67147ebaef1b 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h > +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > /* > * Copyright (c) 2017 Baylibre SAS. > * Author: Jerome Brunet <jbrunet@baylibre.com> > diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c > index d249a035c2b9..6667c9d0238f 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c > +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Pin controller and GPIO driver for Amlogic Meson AXG SoC. > * > * Copyright (c) 2017 Amlogic, Inc. All rights reserved. > * Author: Xingyu Chen <xingyu.chen@amlogic.com> > - * > - * SPDX-License-Identifier: (GPL-2.0+ or MIT) > */ > > #include <dt-bindings/gpio/meson-axg-gpio.h> > diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c > index 3cd86d6a0a60..2c17891ba6a9 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c > +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Pin controller and GPIO driver for Amlogic Meson G12A SoC. > * For meson pinctrl drivers: Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> <snip>
On Wed, Aug 23, 2023 at 10:55 AM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > Documentation/process/license-rules.rst and checkpatch expect the SPDX > identifier syntax for multiple licenses to use capital "OR". Correct it > to keep consistent format and avoid copy-paste issues. > > Correct also the placement of SPDX identifier in pinctrl-meson-axg > files: > > WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Yeah... they are designed to be machine readable so patch applied. Yours, Linus Walleij
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c index 80c43683c789..ae3f8d0da05f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Second generation of pinmux driver for Amlogic Meson-AXG SoC. * @@ -6,8 +7,6 @@ * * Copyright (c) 2017 Amlogic, Inc. All rights reserved. * Author: Xingyu Chen <xingyu.chen@amlogic.com> - * - * SPDX-License-Identifier: (GPL-2.0+ or MIT) */ /* diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h index aa79d7ecee00..67147ebaef1b 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ /* * Copyright (c) 2017 Baylibre SAS. * Author: Jerome Brunet <jbrunet@baylibre.com> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index d249a035c2b9..6667c9d0238f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Pin controller and GPIO driver for Amlogic Meson AXG SoC. * * Copyright (c) 2017 Amlogic, Inc. All rights reserved. * Author: Xingyu Chen <xingyu.chen@amlogic.com> - * - * SPDX-License-Identifier: (GPL-2.0+ or MIT) */ #include <dt-bindings/gpio/meson-axg-gpio.h> diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index 3cd86d6a0a60..2c17891ba6a9 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Pin controller and GPIO driver for Amlogic Meson G12A SoC. * diff --git a/drivers/pinctrl/pinctrl-mlxbf3.c b/drivers/pinctrl/pinctrl-mlxbf3.c index d9944e6a0af9..903606b64d2f 100644 --- a/drivers/pinctrl/pinctrl-mlxbf3.c +++ b/drivers/pinctrl/pinctrl-mlxbf3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause /* Copyright (C) 2022 NVIDIA CORPORATION & AFFILIATES */ #include <linux/bitfield.h>
Documentation/process/license-rules.rst and checkpatch expect the SPDX identifier syntax for multiple licenses to use capital "OR". Correct it to keep consistent format and avoid copy-paste issues. Correct also the placement of SPDX identifier in pinctrl-meson-axg files: WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 +-- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 3 +-- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 2 +- drivers/pinctrl/pinctrl-mlxbf3.c | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-)