| Message ID | 87o9b0yte6.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Input: st1232: convert to SPDX identifiers | expand |
On Thu, Nov 08, 2018 at 06:37:56AM +0000, Kuninori Morimoto wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch updates license to use SPDX-License-Identifier > instead of verbose license text. > > As original license mentioned, it is GPL-2.0 in SPDX. > Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". > See ${LINUX}/include/linux/module.h > > "GPL" [GNU Public License v2 or later] > "GPL v2" [GNU Public License v2] > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Applied, thank you. > --- > drivers/input/touchscreen/st1232.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c > index b716739..11ff32c 100644 > --- a/drivers/input/touchscreen/st1232.c > +++ b/drivers/input/touchscreen/st1232.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * ST1232 Touchscreen Controller Driver > * > @@ -7,15 +8,6 @@ > * Using code from: > * - android.git.kernel.org: projects/kernel/common.git: synaptics_i2c_rmi.c > * Copyright (C) 2007 Google, Inc. > - * > - * This software is licensed under the terms of the GNU General Public > - * License version 2, as published by the Free Software Foundation, and > - * may be copied, distributed, and modified under those terms. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > */ > > #include <linux/delay.h> > @@ -295,4 +287,4 @@ module_i2c_driver(st1232_ts_driver); > > MODULE_AUTHOR("Tony SIM <chinyeow.sim.xt@renesas.com>"); > MODULE_DESCRIPTION("SITRONIX ST1232 Touchscreen Controller Driver"); > -MODULE_LICENSE("GPL"); > +MODULE_LICENSE("GPL v2"); > -- > 2.7.4 >
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index b716739..11ff32c 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ST1232 Touchscreen Controller Driver * @@ -7,15 +8,6 @@ * Using code from: * - android.git.kernel.org: projects/kernel/common.git: synaptics_i2c_rmi.c * Copyright (C) 2007 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include <linux/delay.h> @@ -295,4 +287,4 @@ module_i2c_driver(st1232_ts_driver); MODULE_AUTHOR("Tony SIM <chinyeow.sim.xt@renesas.com>"); MODULE_DESCRIPTION("SITRONIX ST1232 Touchscreen Controller Driver"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2");