luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: spi-nor: Add an SPDX tag to spi-nor.{c,h}

Browse Source 
Add SPDX tags to replace the license boiler-plate and fix the
MODULE_LICENSE() definition in spi-nor.c to match the license text
(GPL v2).

Interestingly, spi-nor.h and spi-nor.c do not use the same license
(GPL v2+ for spi-nor.h, GPL v2 for spi-nor.c).

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
This commit is contained in:
Boris Brezillon 2018-12-06 11:41:20 +01:00
parent eb6ec1d79b
commit e9f3a2bcc3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/spi-nor/spi-nor.c
View File

@ -1,13 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
/* /*
* Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with * Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with
* influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c * influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c
* *
* Copyright (C) 2005, Intec Automation Inc. * Copyright (C) 2005, Intec Automation Inc.
* Copyright (C) 2014, Freescale Semiconductor, Inc. * Copyright (C) 2014, Freescale Semiconductor, Inc.
*
* This code 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/err.h> #include <linux/err.h>
@ -3970,7 +3967,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
} }
EXPORT_SYMBOL_GPL(spi_nor_scan); EXPORT_SYMBOL_GPL(spi_nor_scan);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>"); MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>");
MODULE_AUTHOR("Mike Lavender"); MODULE_AUTHOR("Mike Lavender");
MODULE_DESCRIPTION("framework for SPI NOR"); MODULE_DESCRIPTION("framework for SPI NOR");

6
include/linux/mtd/spi-nor.h
View File

@ -1,10 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* /*
* Copyright (C) 2014 Freescale Semiconductor, Inc. * Copyright (C) 2014 Freescale Semiconductor, 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.
*/ */
#ifndef __LINUX_MTD_SPI_NOR_H #ifndef __LINUX_MTD_SPI_NOR_H