diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-07-02 02:26:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-02 05:56:09 -0400 |
commit | 1a8f0a3c13c136951de7ea24ccb148e745db98a2 (patch) | |
tree | 6f2a722957cdc856b87d68497b3ca5e08f1b8c38 | |
parent | 1356a6071cf4d7187652cd2b18dfab4763e0dba6 (diff) |
ASoC: ac97: convert to SPDX identifiers
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | include/sound/ac97/codec.h | 8 | ||||
-rw-r--r-- | include/sound/ac97/compat.h | 9 | ||||
-rw-r--r-- | include/sound/ac97/controller.h | 8 | ||||
-rw-r--r-- | include/sound/ac97/regs.h | 20 | ||||
-rw-r--r-- | include/sound/ac97_codec.h | 25 | ||||
-rw-r--r-- | sound/soc/soc-ac97.c | 29 |
6 files changed, 28 insertions, 71 deletions
diff --git a/include/sound/ac97/codec.h b/include/sound/ac97/codec.h index ec04be9ab119..9792d25fa369 100644 --- a/include/sound/ac97/codec.h +++ b/include/sound/ac97/codec.h | |||
@@ -1,10 +1,8 @@ | |||
1 | /* | 1 | /* SPDX-License-Identifier: GPL-2.0 |
2 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> | ||
3 | * | 2 | * |
4 | * This program is free software; you can redistribute it and/or modify | 3 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> |
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | 4 | */ |
5 | |||
8 | #ifndef __SOUND_AC97_CODEC2_H | 6 | #ifndef __SOUND_AC97_CODEC2_H |
9 | #define __SOUND_AC97_CODEC2_H | 7 | #define __SOUND_AC97_CODEC2_H |
10 | 8 | ||
diff --git a/include/sound/ac97/compat.h b/include/sound/ac97/compat.h index 1351cba40048..57e19afa31ab 100644 --- a/include/sound/ac97/compat.h +++ b/include/sound/ac97/compat.h | |||
@@ -1,14 +1,11 @@ | |||
1 | /* | 1 | /* SPDX-License-Identifier: GPL-2.0 |
2 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> | ||
3 | * | 2 | * |
4 | * This program is free software; you can redistribute it and/or modify | 3 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> |
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | 4 | * |
8 | * This file is for backward compatibility with snd_ac97 structure and its | 5 | * This file is for backward compatibility with snd_ac97 structure and its |
9 | * multiple usages, such as the snd_ac97_bus and snd_ac97_build_ops. | 6 | * multiple usages, such as the snd_ac97_bus and snd_ac97_build_ops. |
10 | * | ||
11 | */ | 7 | */ |
8 | |||
12 | #ifndef AC97_COMPAT_H | 9 | #ifndef AC97_COMPAT_H |
13 | #define AC97_COMPAT_H | 10 | #define AC97_COMPAT_H |
14 | 11 | ||
diff --git a/include/sound/ac97/controller.h b/include/sound/ac97/controller.h index b36ecdd64f14..06b5afb7fa6b 100644 --- a/include/sound/ac97/controller.h +++ b/include/sound/ac97/controller.h | |||
@@ -1,10 +1,8 @@ | |||
1 | /* | 1 | /* SPDX-License-Identifier: GPL-2.0 |
2 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> | ||
3 | * | 2 | * |
4 | * This program is free software; you can redistribute it and/or modify | 3 | * Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr> |
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | 4 | */ |
5 | |||
8 | #ifndef AC97_CONTROLLER_H | 6 | #ifndef AC97_CONTROLLER_H |
9 | #define AC97_CONTROLLER_H | 7 | #define AC97_CONTROLLER_H |
10 | 8 | ||
diff --git a/include/sound/ac97/regs.h b/include/sound/ac97/regs.h index 9a4fa0c3264a..843f73f3705a 100644 --- a/include/sound/ac97/regs.h +++ b/include/sound/ac97/regs.h | |||
@@ -1,27 +1,11 @@ | |||
1 | /* | 1 | /* SPDX-License-Identifier: GPL-2.0+ |
2 | * | ||
2 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> | 3 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> |
3 | * Universal interface for Audio Codec '97 | 4 | * Universal interface for Audio Codec '97 |
4 | * | 5 | * |
5 | * For more details look to AC '97 component specification revision 2.1 | 6 | * For more details look to AC '97 component specification revision 2.1 |
6 | * by Intel Corporation (http://developer.intel.com). | 7 | * by Intel Corporation (http://developer.intel.com). |
7 | * | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | * | ||
23 | */ | 8 | */ |
24 | |||
25 | /* | 9 | /* |
26 | * AC'97 codec registers | 10 | * AC'97 codec registers |
27 | */ | 11 | */ |
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 89d311a503d3..cc383991c0fe 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h | |||
@@ -1,30 +1,15 @@ | |||
1 | #ifndef __SOUND_AC97_CODEC_H | 1 | /* SPDX-License-Identifier: GPL-2.0+ |
2 | #define __SOUND_AC97_CODEC_H | 2 | * |
3 | |||
4 | /* | ||
5 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> | 3 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> |
6 | * Universal interface for Audio Codec '97 | 4 | * Universal interface for Audio Codec '97 |
7 | * | 5 | * |
8 | * For more details look to AC '97 component specification revision 2.1 | 6 | * For more details look to AC '97 component specification revision 2.1 |
9 | * by Intel Corporation (http://developer.intel.com). | 7 | * by Intel Corporation (http://developer.intel.com). |
10 | * | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License as published by | ||
14 | * the Free Software Foundation; either version 2 of the License, or | ||
15 | * (at your option) any later version. | ||
16 | * | ||
17 | * This program is distributed in the hope that it will be useful, | ||
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | * GNU General Public License for more details. | ||
21 | * | ||
22 | * You should have received a copy of the GNU General Public License | ||
23 | * along with this program; if not, write to the Free Software | ||
24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
25 | * | ||
26 | */ | 8 | */ |
27 | 9 | ||
10 | #ifndef __SOUND_AC97_CODEC_H | ||
11 | #define __SOUND_AC97_CODEC_H | ||
12 | |||
28 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
29 | #include <linux/device.h> | 14 | #include <linux/device.h> |
30 | #include <linux/workqueue.h> | 15 | #include <linux/workqueue.h> |
diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c index 3f424f214bca..c086786e4471 100644 --- a/sound/soc/soc-ac97.c +++ b/sound/soc/soc-ac97.c | |||
@@ -1,20 +1,15 @@ | |||
1 | /* | 1 | // SPDX-License-Identifier: GPL-2.0+ |
2 | * soc-ac97.c -- ALSA SoC Audio Layer AC97 support | 2 | // |
3 | * | 3 | // soc-ac97.c -- ALSA SoC Audio Layer AC97 support |
4 | * Copyright 2005 Wolfson Microelectronics PLC. | 4 | // |
5 | * Copyright 2005 Openedhand Ltd. | 5 | // Copyright 2005 Wolfson Microelectronics PLC. |
6 | * Copyright (C) 2010 Slimlogic Ltd. | 6 | // Copyright 2005 Openedhand Ltd. |
7 | * Copyright (C) 2010 Texas Instruments Inc. | 7 | // Copyright (C) 2010 Slimlogic Ltd. |
8 | * | 8 | // Copyright (C) 2010 Texas Instruments Inc. |
9 | * Author: Liam Girdwood <lrg@slimlogic.co.uk> | 9 | // |
10 | * with code, comments and ideas from :- | 10 | // Author: Liam Girdwood <lrg@slimlogic.co.uk> |
11 | * Richard Purdie <richard@openedhand.com> | 11 | // with code, comments and ideas from :- |
12 | * | 12 | // Richard Purdie <richard@openedhand.com> |
13 | * This program is free software; you can redistribute it and/or modify it | ||
14 | * under the terms of the GNU General Public License as published by the | ||
15 | * Free Software Foundation; either version 2 of the License, or (at your | ||
16 | * option) any later version. | ||
17 | */ | ||
18 | 13 | ||
19 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
20 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |