| Message ID | 20190221100216.25255-9-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | Introduce the generic ECC engine abstraction | expand |
On Thu, 21 Feb 2019 11:01:57 +0100 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Remove the legacy license text, also update the MODULE_LICENSE macro > in accordance with the text at the top of the file (GPL v2 or > higher). > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > drivers/mtd/nand/ecc/sw-bch-engine.c | 17 ++--------------- > include/linux/mtd/nand-sw-bch-engine.h | 5 +---- > 2 files changed, 3 insertions(+), 19 deletions(-) > > diff --git a/drivers/mtd/nand/ecc/sw-bch-engine.c b/drivers/mtd/nand/ecc/sw-bch-engine.c > index 37dc0f0061d3..871c4dd9f71d 100644 > --- a/drivers/mtd/nand/ecc/sw-bch-engine.c > +++ b/drivers/mtd/nand/ecc/sw-bch-engine.c > @@ -1,22 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * This file provides ECC correction for more than 1 bit per block of data, > * using binary BCH codes. It relies on the generic BCH library lib/bch.c. > * > * Copyright © 2011 Ivan Djelic <ivan.djelic@parrot.com> > - * > - * This file 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 or (at your option) any > - * later version. > - * > - * This file 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. > - * > - * You should have received a copy of the GNU General Public License along > - * with this file; if not, write to the Free Software Foundation, Inc., > - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. > */ > > #include <linux/types.h> > @@ -227,6 +214,6 @@ void nand_bch_free(struct nand_bch_control *nbc) > } > EXPORT_SYMBOL(nand_bch_free); > > -MODULE_LICENSE("GPL"); > +MODULE_LICENSE("GPL v2"); GPL was correct here, see [1] [1]https://elixir.bootlin.com/linux/v5.0-rc7/source/include/linux/module.h#L175
Hi Boris, Boris Brezillon <bbrezillon@kernel.org> wrote on Thu, 21 Feb 2019 12:25:38 +0100: > On Thu, 21 Feb 2019 11:01:57 +0100 > Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > > Remove the legacy license text, also update the MODULE_LICENSE macro > > in accordance with the text at the top of the file (GPL v2 or > > higher). > > > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > > --- > > drivers/mtd/nand/ecc/sw-bch-engine.c | 17 ++--------------- > > include/linux/mtd/nand-sw-bch-engine.h | 5 +---- > > 2 files changed, 3 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/mtd/nand/ecc/sw-bch-engine.c b/drivers/mtd/nand/ecc/sw-bch-engine.c > > index 37dc0f0061d3..871c4dd9f71d 100644 > > --- a/drivers/mtd/nand/ecc/sw-bch-engine.c > > +++ b/drivers/mtd/nand/ecc/sw-bch-engine.c > > @@ -1,22 +1,9 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > /* > > * This file provides ECC correction for more than 1 bit per block of data, > > * using binary BCH codes. It relies on the generic BCH library lib/bch.c. > > * > > * Copyright © 2011 Ivan Djelic <ivan.djelic@parrot.com> > > - * > > - * This file 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 or (at your option) any > > - * later version. > > - * > > - * This file 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. > > - * > > - * You should have received a copy of the GNU General Public License along > > - * with this file; if not, write to the Free Software Foundation, Inc., > > - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. > > */ > > > > #include <linux/types.h> > > @@ -227,6 +214,6 @@ void nand_bch_free(struct nand_bch_control *nbc) > > } > > EXPORT_SYMBOL(nand_bch_free); > > > > -MODULE_LICENSE("GPL"); > > +MODULE_LICENSE("GPL v2"); > > GPL was correct here, see [1] > > [1]https://elixir.bootlin.com/linux/v5.0-rc7/source/include/linux/module.h#L175 Oh right, then it's the same for the similar patch over the Hamming file. I will correct both, thanks for pointing it. Thanks, Miquèl
diff --git a/drivers/mtd/nand/ecc/sw-bch-engine.c b/drivers/mtd/nand/ecc/sw-bch-engine.c index 37dc0f0061d3..871c4dd9f71d 100644 --- a/drivers/mtd/nand/ecc/sw-bch-engine.c +++ b/drivers/mtd/nand/ecc/sw-bch-engine.c @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file provides ECC correction for more than 1 bit per block of data, * using binary BCH codes. It relies on the generic BCH library lib/bch.c. * * Copyright © 2011 Ivan Djelic <ivan.djelic@parrot.com> - * - * This file 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 or (at your option) any - * later version. - * - * This file 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. - * - * You should have received a copy of the GNU General Public License along - * with this file; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include <linux/types.h> @@ -227,6 +214,6 @@ void nand_bch_free(struct nand_bch_control *nbc) } EXPORT_SYMBOL(nand_bch_free); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Ivan Djelic <ivan.djelic@parrot.com>"); MODULE_DESCRIPTION("NAND software BCH ECC support"); diff --git a/include/linux/mtd/nand-sw-bch-engine.h b/include/linux/mtd/nand-sw-bch-engine.h index a682a15fa165..12107aa7c371 100644 --- a/include/linux/mtd/nand-sw-bch-engine.h +++ b/include/linux/mtd/nand-sw-bch-engine.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright © 2011 Ivan Djelic <ivan.djelic@parrot.com> * - * 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. - * * This file is the header for the NAND BCH ECC implementation. */
Remove the legacy license text, also update the MODULE_LICENSE macro in accordance with the text at the top of the file (GPL v2 or higher). Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/ecc/sw-bch-engine.c | 17 ++--------------- include/linux/mtd/nand-sw-bch-engine.h | 5 +---- 2 files changed, 3 insertions(+), 19 deletions(-)