On Wed, 13 Mar 2019 12:41:20 +0100
Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx> wrote:
> Adopt the SPDX license identifier headers to ease license compliance
> management. Also fix MODULE_LICENSE for cros_ec_accel_legacy to match
> the SPDX and boiler plate license.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
Applied.
Thanks,
Jonathan
> ---
>
> drivers/iio/accel/cros_ec_accel_legacy.c | 12 ++----------
> drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 10 +---------
> .../common/cros_ec_sensors/cros_ec_sensors_core.c | 10 +---------
> drivers/iio/light/cros_ec_light_prox.c | 10 +---------
> drivers/iio/pressure/cros_ec_baro.c | 10 +---------
> 5 files changed, 6 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c
> index 3be10b121a28..46bb2e421bb9 100644
> --- a/drivers/iio/accel/cros_ec_accel_legacy.c
> +++ b/drivers/iio/accel/cros_ec_accel_legacy.c
> @@ -1,17 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Driver for older Chrome OS EC accelerometer
> *
> * Copyright 2017 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 memory mapper cros-ec interface to communicate
> * with the Chrome OS EC about accelerometer data.
> * Accelerometer access is presented through iio sysfs.
> @@ -415,5 +407,5 @@ module_platform_driver(cros_ec_accel_platform_driver);
>
> MODULE_DESCRIPTION("ChromeOS EC legacy accelerometer driver");
> MODULE_AUTHOR("Gwendal Grignou <gwendal@xxxxxxxxxxxx>");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> MODULE_ALIAS("platform:" DRV_NAME);
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> index 7d3950952ae6..17af4e0fd5f8 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
> @@ -1,17 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * cros_ec_sensors - Driver for Chrome OS Embedded Controller sensors.
> *
> * 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 cros-ec interface to communicate with the Chrome OS
> * EC about sensors data. Data access is presented through iio sysfs.
> */
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> index eb7b0edd5da4..719a0df5aeeb 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * cros_ec_sensors_core - Common function for Chrome OS EC sensor driver.
> *
> * 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.
> */
>
> #include <linux/delay.h>
> diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
> index 7bb3078217b3..308ee6ff2e22 100644
> --- a/drivers/iio/light/cros_ec_light_prox.c
> +++ b/drivers/iio/light/cros_ec_light_prox.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * cros_ec_light_prox - Driver for light and prox sensors behing CrosEC.
> *
> * Copyright (C) 2017 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/device.h>
> diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
> index 886690785047..034ce98d6e97 100644
> --- a/drivers/iio/pressure/cros_ec_baro.c
> +++ b/drivers/iio/pressure/cros_ec_baro.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * cros_ec_baro - Driver for barometer sensor behind CrosEC.
> *
> * Copyright (C) 2017 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/device.h>
