diff options
author | Suman Anna <s-anna@ti.com> | 2018-05-31 13:10:59 -0400 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-06-03 20:37:11 -0400 |
commit | 3e79bfd61cbba28ffa54ff15475495f18bcf3c7f (patch) | |
tree | 9e074c209ea5a6e610704d7c5a4ff04ad85f6678 | |
parent | cc1c8445eba5b78f5b719c47572473d7a7caa038 (diff) |
rpmsg: Switch to SPDX license identifier
Use the appropriate SPDX license identifier in the rpmsg core
source files and drop the previous boilerplate license text.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r-- | drivers/rpmsg/Kconfig | 2 | ||||
-rw-r--r-- | drivers/rpmsg/rpmsg_core.c | 10 | ||||
-rw-r--r-- | drivers/rpmsg/rpmsg_internal.h | 10 | ||||
-rw-r--r-- | include/linux/rpmsg.h | 27 |
4 files changed, 5 insertions, 44 deletions
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig index 9b14090e3603..d0322b41eca5 100644 --- a/drivers/rpmsg/Kconfig +++ b/drivers/rpmsg/Kconfig | |||
@@ -1,3 +1,5 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | |||
1 | menu "Rpmsg drivers" | 3 | menu "Rpmsg drivers" |
2 | 4 | ||
3 | # RPMSG always gets selected by whoever wants it | 5 | # RPMSG always gets selected by whoever wants it |
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index bea7c74e12eb..b714a543a91d 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
1 | /* | 2 | /* |
2 | * remote processor messaging bus | 3 | * remote processor messaging bus |
3 | * | 4 | * |
@@ -6,15 +7,6 @@ | |||
6 | * | 7 | * |
7 | * Ohad Ben-Cohen <ohad@wizery.com> | 8 | * Ohad Ben-Cohen <ohad@wizery.com> |
8 | * Brian Swetland <swetland@google.com> | 9 | * Brian Swetland <swetland@google.com> |
9 | * | ||
10 | * This software is licensed under the terms of the GNU General Public | ||
11 | * License version 2, as published by the Free Software Foundation, and | ||
12 | * may be copied, distributed, and modified under those terms. | ||
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 | */ | 10 | */ |
19 | 11 | ||
20 | #define pr_fmt(fmt) "%s: " fmt, __func__ | 12 | #define pr_fmt(fmt) "%s: " fmt, __func__ |
diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index 685aa70e9cbe..0d791c30b7ea 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h | |||
@@ -1,3 +1,4 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
1 | /* | 2 | /* |
2 | * remote processor messaging bus internals | 3 | * remote processor messaging bus internals |
3 | * | 4 | * |
@@ -6,15 +7,6 @@ | |||
6 | * | 7 | * |
7 | * Ohad Ben-Cohen <ohad@wizery.com> | 8 | * Ohad Ben-Cohen <ohad@wizery.com> |
8 | * Brian Swetland <swetland@google.com> | 9 | * Brian Swetland <swetland@google.com> |
9 | * | ||
10 | * This software is licensed under the terms of the GNU General Public | ||
11 | * License version 2, as published by the Free Software Foundation, and | ||
12 | * may be copied, distributed, and modified under those terms. | ||
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 | */ | 10 | */ |
19 | 11 | ||
20 | #ifndef __RPMSG_INTERNAL_H__ | 12 | #ifndef __RPMSG_INTERNAL_H__ |
diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index ca07366c4c33..9fe156d1c018 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h | |||
@@ -1,35 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: BSD-3-Clause */ | ||
1 | /* | 2 | /* |
2 | * Remote processor messaging | 3 | * Remote processor messaging |
3 | * | 4 | * |
4 | * Copyright (C) 2011 Texas Instruments, Inc. | 5 | * Copyright (C) 2011 Texas Instruments, Inc. |
5 | * Copyright (C) 2011 Google, Inc. | 6 | * Copyright (C) 2011 Google, Inc. |
6 | * All rights reserved. | 7 | * All rights reserved. |
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * * Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * * Redistributions in binary form must reproduce the above copyright | ||
15 | * notice, this list of conditions and the following disclaimer in | ||
16 | * the documentation and/or other materials provided with the | ||
17 | * distribution. | ||
18 | * * Neither the name Texas Instruments nor the names of its | ||
19 | * contributors may be used to endorse or promote products derived | ||
20 | * from this software without specific prior written permission. | ||
21 | * | ||
22 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
23 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
24 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
25 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
26 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
27 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
28 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
29 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
30 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
31 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
32 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
33 | */ | 8 | */ |
34 | 9 | ||
35 | #ifndef _LINUX_RPMSG_H | 10 | #ifndef _LINUX_RPMSG_H |