| Message ID | 20181129141026.24892-6-boris.brezillon@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mtd: spi-nor: Random cleanups | expand |
On 29/11/2018 15:10, Boris Brezillon wrote: > Add an SPDX tag to replace the license boiler-plate and fix the > MODULE_LICENSE() definition to match the the license (GPL v2). > > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Aleaxander Sverdlin <alexander.sverdlin@nokia.com> > --- > Changes in v2: > - New patch > --- > drivers/mtd/spi-nor/spi-nor.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index ed1d7ad2dcbb..d2b09f52b1fb 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> > @@ -3814,7 +3811,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");
On 11/29/2018 04:10 PM, Boris Brezillon wrote: > Add an SPDX tag to replace the license boiler-plate and fix the > MODULE_LICENSE() definition to match the the license (GPL v2). > Can we add the spdx tag for include/linux/mtd/spi-nor.h in the same patch? Cheers, ta
On Tue, 4 Dec 2018 19:45:51 +0000 <Tudor.Ambarus@microchip.com> wrote: > On 11/29/2018 04:10 PM, Boris Brezillon wrote: > > Add an SPDX tag to replace the license boiler-plate and fix the > > MODULE_LICENSE() definition to match the the license (GPL v2). > > > > Can we add the spdx tag for include/linux/mtd/spi-nor.h in the same patch? Absolutely. I'll fix that.
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index ed1d7ad2dcbb..d2b09f52b1fb 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> @@ -3814,7 +3811,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");
Add an SPDX tag to replace the license boiler-plate and fix the MODULE_LICENSE() definition to match the the license (GPL v2). Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- Changes in v2: - New patch --- drivers/mtd/spi-nor/spi-nor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)