[alsa-devel] [PATCH] ASoC: madera: Update SPDX headers
The madera driver was merged too late to catch Thomas Gleixner's cleanup of the SPDX headers tree wide. Update the headers to match what was done in that patch.
Signed-off-by: Charles Keepax ckeepax@opensource.cirrus.com --- include/dt-bindings/sound/madera.h | 6 +----- include/sound/madera-pdata.h | 6 +----- sound/soc/codecs/cs47l35.c | 6 +----- sound/soc/codecs/cs47l85.c | 6 +----- sound/soc/codecs/cs47l90.c | 6 +----- sound/soc/codecs/madera.c | 6 +----- sound/soc/codecs/madera.h | 6 +----- 7 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/include/dt-bindings/sound/madera.h b/include/dt-bindings/sound/madera.h index 9ff4eae5259b0..d0096d5eb0dab 100644 --- a/include/dt-bindings/sound/madera.h +++ b/include/dt-bindings/sound/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Device Tree defines for Madera codecs * * Copyright (C) 2016-2017 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */
#ifndef DT_BINDINGS_SOUND_MADERA_H diff --git a/include/sound/madera-pdata.h b/include/sound/madera-pdata.h index 441decefb7f34..e3060f48f1081 100644 --- a/include/sound/madera-pdata.h +++ b/include/sound/madera-pdata.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Platform data for Madera codec driver * * Copyright (C) 2016-2019 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */
#ifndef MADERA_CODEC_PDATA_H diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index 02f193dadd41a..511d0d6fa962a 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L35 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/delay.h> #include <linux/device.h> diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 4c4bae6e2c57e..32fe7ffb75268 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L85 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index 83c4e4628bdea..c4ecb0e6911af 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L90 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 6146c7a070cb3..1b1be19a2f991 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // Cirrus Logic Madera class codecs common support // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/delay.h> #include <linux/gcd.h> diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h index aa2db156582b9..0af66f2807708 100644 --- a/sound/soc/codecs/madera.h +++ b/sound/soc/codecs/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Cirrus Logic Madera class codecs common support * * Copyright (C) 2015-2018 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation; version 2. */
#ifndef ASOC_MADERA_H
The patch
ASoC: madera: Update SPDX headers
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 472e5df0137e10fbaed0eef38c9bdf99e088ff13 Mon Sep 17 00:00:00 2001
From: Charles Keepax ckeepax@opensource.cirrus.com Date: Tue, 25 Jun 2019 16:37:27 +0100 Subject: [PATCH] ASoC: madera: Update SPDX headers
The madera driver was merged too late to catch Thomas Gleixner's cleanup of the SPDX headers tree wide. Update the headers to match what was done in that patch.
Signed-off-by: Charles Keepax ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown broonie@kernel.org --- include/dt-bindings/sound/madera.h | 6 +----- include/sound/madera-pdata.h | 6 +----- sound/soc/codecs/cs47l35.c | 6 +----- sound/soc/codecs/cs47l85.c | 6 +----- sound/soc/codecs/cs47l90.c | 6 +----- sound/soc/codecs/madera.c | 6 +----- sound/soc/codecs/madera.h | 6 +----- 7 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/include/dt-bindings/sound/madera.h b/include/dt-bindings/sound/madera.h index 9ff4eae5259b..d0096d5eb0da 100644 --- a/include/dt-bindings/sound/madera.h +++ b/include/dt-bindings/sound/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Device Tree defines for Madera codecs * * Copyright (C) 2016-2017 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */
#ifndef DT_BINDINGS_SOUND_MADERA_H diff --git a/include/sound/madera-pdata.h b/include/sound/madera-pdata.h index 441decefb7f3..e3060f48f108 100644 --- a/include/sound/madera-pdata.h +++ b/include/sound/madera-pdata.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Platform data for Madera codec driver * * Copyright (C) 2016-2019 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */
#ifndef MADERA_CODEC_PDATA_H diff --git a/sound/soc/codecs/cs47l35.c b/sound/soc/codecs/cs47l35.c index 02f193dadd41..511d0d6fa962 100644 --- a/sound/soc/codecs/cs47l35.c +++ b/sound/soc/codecs/cs47l35.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L35 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/delay.h> #include <linux/device.h> diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 4c4bae6e2c57..32fe7ffb7526 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L85 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c index 83c4e4628bde..c4ecb0e6911a 100644 --- a/sound/soc/codecs/cs47l90.c +++ b/sound/soc/codecs/cs47l90.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // ALSA SoC Audio driver for CS47L90 codec // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/module.h> #include <linux/moduleparam.h> diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 6146c7a070cb..1b1be19a2f99 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -1,14 +1,10 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // Cirrus Logic Madera class codecs common support // // Copyright (C) 2015-2019 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by the -// Free Software Foundation; version 2. -//
#include <linux/delay.h> #include <linux/gcd.h> diff --git a/sound/soc/codecs/madera.h b/sound/soc/codecs/madera.h index aa2db156582b..0af66f280770 100644 --- a/sound/soc/codecs/madera.h +++ b/sound/soc/codecs/madera.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Cirrus Logic Madera class codecs common support * * Copyright (C) 2015-2018 Cirrus Logic, Inc. and * Cirrus Logic International Semiconductor Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation; version 2. */
#ifndef ASOC_MADERA_H
participants (2)
-
Charles Keepax -
Mark Brown