| Message ID | 20180421004153.19073-3-masneyb@onstation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 20 Apr 2018 20:41:42 -0400 Brian Masney <masneyb@onstation.org> wrote: > The summary text for the GPL is not needed since the SPDX identifier > is a legally binding shorthand that can be used instead. > > Signed-off-by: Brian Masney <masneyb@onstation.org> I sanity checked against other drivers because I wasn't 100% sure this wasn't a valid formatting for SPDX. It doesn't seem to be. Normally convention is //SPDX... On the first line of the file. C style comments also fine, but it needs to be a comment line on it's own. This is all about making it trivial for automated tools to find. Thanks, Jonathan > --- > drivers/staging/iio/light/tsl2x7x.c | 10 +--------- > drivers/staging/iio/light/tsl2x7x.h | 14 +------------- > 2 files changed, 2 insertions(+), 22 deletions(-) > > diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c > index eeccfbb0eb1f..9cdcc8c9e812 100644 > --- a/drivers/staging/iio/light/tsl2x7x.c > +++ b/drivers/staging/iio/light/tsl2x7x.c > @@ -5,15 +5,7 @@ > * Copyright (c) 2012, TAOS Corporation. > * Copyright (c) 2017-2018 Brian Masney <masneyb@onstation.org> > * > - * 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. > - * > - * This program 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. > + * SPDX-License-Identifier: GPL-2.0+ > */ > > #include <linux/delay.h> > diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h > index d382cdbb976e..992ee2465609 100644 > --- a/drivers/staging/iio/light/tsl2x7x.h > +++ b/drivers/staging/iio/light/tsl2x7x.h > @@ -4,19 +4,7 @@ > * > * Copyright (c) 2012, TAOS Corporation. > * > - * 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. > - * > - * This program 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 program; if not, write to the Free Software Foundation, Inc., > - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > + * SPDX-License-Identifier: GPL-2.0+ > */ > > #ifndef __TSL2X7X_H -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Apr 21, 2018 at 05:16:38PM +0100, Jonathan Cameron wrote: > On Fri, 20 Apr 2018 20:41:42 -0400 > Brian Masney <masneyb@onstation.org> wrote: > > > The summary text for the GPL is not needed since the SPDX identifier > > is a legally binding shorthand that can be used instead. > > > > Signed-off-by: Brian Masney <masneyb@onstation.org> > I sanity checked against other drivers because I wasn't 100% sure > this wasn't a valid formatting for SPDX. It doesn't seem to be. > Normally convention is > //SPDX... > On the first line of the file. > C style comments also fine, but it needs to be a comment line on it's > own. This is all about making it trivial for automated tools to find. The style that you referenced is the most common style, however I saw quite a few places in the kernel use the style used by this patch so I thought that it may be acceptable. $ grep -r SPDX arch/ drivers/ include/ | grep \* | grep -v ":\/" I'll resubmit the patch next week with hopefully the last bit of cleanups to get this driver out of staging. Brian > > --- > > drivers/staging/iio/light/tsl2x7x.c | 10 +--------- > > drivers/staging/iio/light/tsl2x7x.h | 14 +------------- > > 2 files changed, 2 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c > > index eeccfbb0eb1f..9cdcc8c9e812 100644 > > --- a/drivers/staging/iio/light/tsl2x7x.c > > +++ b/drivers/staging/iio/light/tsl2x7x.c > > @@ -5,15 +5,7 @@ > > * Copyright (c) 2012, TAOS Corporation. > > * Copyright (c) 2017-2018 Brian Masney <masneyb@onstation.org> > > * > > - * 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. > > - * > > - * This program 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. > > + * SPDX-License-Identifier: GPL-2.0+ > > */ > > > > #include <linux/delay.h> > > diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h > > index d382cdbb976e..992ee2465609 100644 > > --- a/drivers/staging/iio/light/tsl2x7x.h > > +++ b/drivers/staging/iio/light/tsl2x7x.h > > @@ -4,19 +4,7 @@ > > * > > * Copyright (c) 2012, TAOS Corporation. > > * > > - * 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. > > - * > > - * This program 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 program; if not, write to the Free Software Foundation, Inc., > > - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > > + * SPDX-License-Identifier: GPL-2.0+ > > */ > > > > #ifndef __TSL2X7X_H -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index eeccfbb0eb1f..9cdcc8c9e812 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -5,15 +5,7 @@ * Copyright (c) 2012, TAOS Corporation. * Copyright (c) 2017-2018 Brian Masney <masneyb@onstation.org> * - * 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. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/delay.h> diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h index d382cdbb976e..992ee2465609 100644 --- a/drivers/staging/iio/light/tsl2x7x.h +++ b/drivers/staging/iio/light/tsl2x7x.h @@ -4,19 +4,7 @@ * * Copyright (c) 2012, TAOS Corporation. * - * 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. - * - * This program 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 program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __TSL2X7X_H
The summary text for the GPL is not needed since the SPDX identifier is a legally binding shorthand that can be used instead. Signed-off-by: Brian Masney <masneyb@onstation.org> --- drivers/staging/iio/light/tsl2x7x.c | 10 +--------- drivers/staging/iio/light/tsl2x7x.h | 14 +------------- 2 files changed, 2 insertions(+), 22 deletions(-)