And get rid of the license text that is no longer necessary. Also fix the license as sometimes doesn't match what the header with the value in the MODULE_LICENSE macro. Assuming that the desired license is GPL-2.0+, all the files are updated to this license version.
Signed-off-by: Enric Balletbo i Serra <enric.balle...@collabora.com> --- drivers/mfd/cros_ec.c | 27 +++++++++------------------ drivers/mfd/cros_ec_dev.c | 24 ++++++------------------ drivers/mfd/cros_ec_dev.h | 16 ++-------------- drivers/mfd/cros_ec_i2c.c | 19 +++++-------------- drivers/mfd/cros_ec_spi.c | 21 ++++++--------------- include/linux/mfd/cros_ec.h | 10 +--------- include/linux/mfd/cros_ec_commands.h | 10 +--------- include/linux/mfd/cros_ec_lpc_mec.h | 12 ++---------- include/linux/mfd/cros_ec_lpc_reg.h | 12 ++---------- 9 files changed, 34 insertions(+), 117 deletions(-) diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index 58e05069163e..6f27c0ffb177 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -1,21 +1,12 @@ -/* - * ChromeOS EC multi-function device - * - * Copyright (C) 2012 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. - * - * The ChromeOS EC multi function device is used to mux all the requests - * to the EC device for its multiple features: keyboard controller, - * battery charging and regulator control, firmware update. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// ChromeOS EC multi-function device. +// +// Copyright (C) 2012 Google, Inc +// +// The ChromeOS EC multi function device is used to mux all the requests +// to the EC device for its multiple features: keyboard controller, +// battery charging and regulator control, firmware update. #include <linux/of_platform.h> #include <linux/interrupt.h> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 5e5fbd40e9d0..192f6af6270f 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -1,21 +1,9 @@ -/* - * cros_ec_dev - expose the Chrome OS Embedded Controller to user-space - * - * Copyright (C) 2014 Google, Inc. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// Expose the ChromeOS Embedded Controller to user-space. +// +// Copyright (C) 2014 Google, Inc. +// Author: Bill Richardson <wfric...@chromium.org> #include <linux/fs.h> #include <linux/mfd/core.h> diff --git a/drivers/mfd/cros_ec_dev.h b/drivers/mfd/cros_ec_dev.h index 45e9453608c5..f80088ffc3b3 100644 --- a/drivers/mfd/cros_ec_dev.h +++ b/drivers/mfd/cros_ec_dev.h @@ -1,20 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * cros_ec_dev - expose the Chrome OS Embedded Controller to userspace + * cros_ec_dev - Expose the Chrome OS Embedded Controller to userspace * * Copyright (C) 2014 Google, Inc. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _CROS_EC_DEV_H_ diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c index ef9b4763356f..891fcfd44f8a 100644 --- a/drivers/mfd/cros_ec_i2c.c +++ b/drivers/mfd/cros_ec_i2c.c @@ -1,17 +1,8 @@ -/* - * ChromeOS EC multi-function device (I2C) - * - * Copyright (C) 2012 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. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// ChromeOS EC multi-function device (I2C). +// +// Copyright (C) 2012 Google, Inc #include <linux/acpi.h> #include <linux/delay.h> diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c index 2060d1483043..95bc6d0cde76 100644 --- a/drivers/mfd/cros_ec_spi.c +++ b/drivers/mfd/cros_ec_spi.c @@ -1,17 +1,8 @@ -/* - * ChromeOS EC multi-function device (SPI) - * - * Copyright (C) 2012 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. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// ChromeOS EC multi-function device (SPI). +// +// Copyright (C) 2012 Google, Inc #include <linux/delay.h> #include <linux/kernel.h> @@ -739,5 +730,5 @@ static struct spi_driver cros_ec_driver_spi = { module_spi_driver(cros_ec_driver_spi); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("ChromeOS EC multi function device (SPI)"); diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index 32421dfeb996..f6ed58166111 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h @@ -1,16 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * ChromeOS EC multi-function device * * Copyright (C) 2012 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. */ #ifndef __LINUX_MFD_CROS_EC_H diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h index f2edd9969b40..bf762ae46378 100644 --- a/include/linux/mfd/cros_ec_commands.h +++ b/include/linux/mfd/cros_ec_commands.h @@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Host communication command constants for ChromeOS EC * * Copyright (C) 2012 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. - * * The ChromeOS EC multi function device is used to mux all the requests * to the EC device for its multiple features: keyboard controller, * battery charging and regulator control, firmware update. diff --git a/include/linux/mfd/cros_ec_lpc_mec.h b/include/linux/mfd/cros_ec_lpc_mec.h index 176496ddc66c..485f31f9c39b 100644 --- a/include/linux/mfd/cros_ec_lpc_mec.h +++ b/include/linux/mfd/cros_ec_lpc_mec.h @@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * cros_ec_lpc_mec - LPC variant I/O for Microchip EC + * LPC variant I/O for Microchip EC * * Copyright (C) 2016 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. - * * This driver uses the Chrome OS EC byte-level message-based protocol for * communicating the keyboard state (which keys are pressed) from a keyboard EC * to the AP over some bus (such as i2c, lpc, spi). The EC does debouncing, diff --git a/include/linux/mfd/cros_ec_lpc_reg.h b/include/linux/mfd/cros_ec_lpc_reg.h index 5560bef63c2b..14c7e17598c8 100644 --- a/include/linux/mfd/cros_ec_lpc_reg.h +++ b/include/linux/mfd/cros_ec_lpc_reg.h @@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* - * cros_ec_lpc_reg - LPC access to the Chrome OS Embedded Controller + * LPC register access to the ChromeOS Embedded Controller * * Copyright (C) 2016 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. - * * This driver uses the Chrome OS EC byte-level message-based protocol for * communicating the keyboard state (which keys are pressed) from a keyboard EC * to the AP over some bus (such as i2c, lpc, spi). The EC does debouncing, -- 2.17.1