There were a few files for the soc_camera drivers that did not have SPDX identifiers on them, so fix that up. At the same time, remove the "free form" text that specified the license of the file, as that is impossible for any tool to properly parse. Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Cc: Shawn Guo <shawnguo@xxxxxxxxxx> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Cc: Fabio Estevam <festevam@xxxxxxxxx> Cc: NXP Linux Team <linux-imx@xxxxxxx> Cc: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> Cc: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Cc: linux-media@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/media/soc_camera/imx074.c | 6 +----- drivers/staging/media/soc_camera/mt9t031.c | 6 +----- drivers/staging/media/soc_camera/soc_camera.c | 6 +----- drivers/staging/media/soc_camera/soc_mediabus.c | 6 +----- drivers/staging/media/soc_camera/soc_mt9v022.c | 6 +----- drivers/staging/media/soc_camera/soc_ov5642.c | 6 +----- drivers/staging/media/soc_camera/soc_ov9740.c | 6 +----- 7 files changed, 7 insertions(+), 35 deletions(-) diff --git a/drivers/staging/media/soc_camera/imx074.c b/drivers/staging/media/soc_camera/imx074.c index 1676c166dc83..d907aa62f898 100644 --- a/drivers/staging/media/soc_camera/imx074.c +++ b/drivers/staging/media/soc_camera/imx074.c @@ -1,15 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for IMX074 CMOS Image Sensor from Sony * * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@xxxxxx> * * Partially inspired by the IMX074 driver from the Android / MSM tree - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/delay.h> #include <linux/i2c.h> #include <linux/v4l2-mediabus.h> diff --git a/drivers/staging/media/soc_camera/mt9t031.c b/drivers/staging/media/soc_camera/mt9t031.c index 4ff179302b4f..615ae9df2c57 100644 --- a/drivers/staging/media/soc_camera/mt9t031.c +++ b/drivers/staging/media/soc_camera/mt9t031.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for MT9T031 CMOS Image Sensor from Micron * * Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering <lg@xxxxxxx> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/device.h> #include <linux/i2c.h> #include <linux/log2.h> diff --git a/drivers/staging/media/soc_camera/soc_camera.c b/drivers/staging/media/soc_camera/soc_camera.c index 1ab86a7499b9..a6232dcd59bc 100644 --- a/drivers/staging/media/soc_camera/soc_camera.c +++ b/drivers/staging/media/soc_camera/soc_camera.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * camera image capture (abstract) bus driver * @@ -10,12 +11,7 @@ * SoCs. Later it should also be used for i.MX31 SoCs from Freescale. * It can handle multiple cameras and / or multiple buses, which can * be used, e.g., in stereo-vision applications. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/device.h> #include <linux/err.h> #include <linux/i2c.h> diff --git a/drivers/staging/media/soc_camera/soc_mediabus.c b/drivers/staging/media/soc_camera/soc_mediabus.c index be74008ec0ca..2aa646c89c1f 100644 --- a/drivers/staging/media/soc_camera/soc_mediabus.c +++ b/drivers/staging/media/soc_camera/soc_mediabus.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * soc-camera media bus helper routines * * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@xxxxxx> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/kernel.h> #include <linux/module.h> diff --git a/drivers/staging/media/soc_camera/soc_mt9v022.c b/drivers/staging/media/soc_camera/soc_mt9v022.c index 6d922b17ea94..e7e0d3d29499 100644 --- a/drivers/staging/media/soc_camera/soc_mt9v022.c +++ b/drivers/staging/media/soc_camera/soc_mt9v022.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for MT9V022 CMOS Image Sensor from Micron * * Copyright (C) 2008, Guennadi Liakhovetski <kernel@xxxxxxxxxxxxxx> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/videodev2.h> #include <linux/slab.h> #include <linux/i2c.h> diff --git a/drivers/staging/media/soc_camera/soc_ov5642.c b/drivers/staging/media/soc_camera/soc_ov5642.c index 0931898c79dd..94696d7baf83 100644 --- a/drivers/staging/media/soc_camera/soc_ov5642.c +++ b/drivers/staging/media/soc_camera/soc_ov5642.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for OV5642 CMOS Image Sensor from Omnivision * @@ -8,12 +9,7 @@ * * Based on Omnivision OV7670 Camera Driver * Copyright (C) 2006-7 Jonathan Corbet <corbet@xxxxxxx> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/bitops.h> #include <linux/delay.h> #include <linux/i2c.h> diff --git a/drivers/staging/media/soc_camera/soc_ov9740.c b/drivers/staging/media/soc_camera/soc_ov9740.c index a07d3145d1b4..7c765595d85f 100644 --- a/drivers/staging/media/soc_camera/soc_ov9740.c +++ b/drivers/staging/media/soc_camera/soc_ov9740.c @@ -1,15 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 /* * OmniVision OV9740 Camera Driver * * Copyright (C) 2011 NVIDIA Corporation * * Based on ov9640 camera driver. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ - #include <linux/init.h> #include <linux/module.h> #include <linux/i2c.h> -- 2.21.0
