Message ID | 20181206104120.6280-6-boris.brezillon@bootlin.com |
---|---|
State | Accepted |
Delegated to: | Boris Brezillon |
Headers | show |
Series | mtd: spi-nor: Random cleanups | expand |
On 12/06/2018 12:41 PM, Boris Brezillon wrote: > 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> > --- > Changes in v3: > - Add an SPDX tag to spi-nor.h > > Changes in v2: > - New patch > --- > drivers/mtd/spi-nor/spi-nor.c | 7 ++----- > include/linux/mtd/spi-nor.h | 6 +----- > 2 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index db31a81a68b2..2e9306e1c52a 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with > * influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c > * > * Copyright (C) 2005, Intec Automation 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> > @@ -3878,7 +3875,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, > } > EXPORT_SYMBOL_GPL(spi_nor_scan); > > -MODULE_LICENSE("GPL"); > +MODULE_LICENSE("GPL v2"); > MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>"); > MODULE_AUTHOR("Mike Lavender"); > MODULE_DESCRIPTION("framework for SPI NOR"); > diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h > index 981d628305a2..5f177aa39f68 100644 > --- a/include/linux/mtd/spi-nor.h > +++ b/include/linux/mtd/spi-nor.h > @@ -1,10 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * 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 >
On Thu, 2018-12-06 at 10:41:20 UTC, Boris Brezillon wrote: > 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> Applied to http://git.infradead.org/linux-mtd.git spi-nor/next. Boris
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index db31a81a68b2..2e9306e1c52a 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with * influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c * * Copyright (C) 2005, Intec Automation 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> @@ -3878,7 +3875,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, } EXPORT_SYMBOL_GPL(spi_nor_scan); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>"); MODULE_AUTHOR("Mike Lavender"); MODULE_DESCRIPTION("framework for SPI NOR"); diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 981d628305a2..5f177aa39f68 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * 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
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> --- Changes in v3: - Add an SPDX tag to spi-nor.h Changes in v2: - New patch --- drivers/mtd/spi-nor/spi-nor.c | 7 ++----- include/linux/mtd/spi-nor.h | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-)