| Message ID | 20180412211437.21599-4-peda@axentia.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 12, 2018 at 11:14:35PM +0200, Peter Rosin wrote: > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Driver for the MAX9860 Mono Audio Voice Codec > * Please don't mix C and C++ comments like this - it looks unintentional and messy. Just convert the entire comment block to C++ so it's consistent with itself.
On 2018-04-13 13:19, Mark Brown wrote: > On Thu, Apr 12, 2018 at 11:14:35PM +0200, Peter Rosin wrote: > >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> /* >> * Driver for the MAX9860 Mono Audio Voice Codec >> * > > Please don't mix C and C++ comments like this - it looks unintentional > and messy. Just convert the entire comment block to C++ so it's > consistent with itself. Done. Cheers, Peter Peter Rosin (2): ASoC: max9860: switch to SPDX license tag ASoC: tfa9879: switch to SPDX license tag sound/soc/codecs/max9860.c | 31 +++++++++++-------------------- sound/soc/codecs/max9860.h | 10 +--------- sound/soc/codecs/tfa9879.c | 18 ++++++------------ sound/soc/codecs/tfa9879.h | 7 +------ 4 files changed, 19 insertions(+), 47 deletions(-)
On Fri, Apr 13, 2018 at 01:47:49PM +0200, Peter Rosin wrote: > Peter Rosin (2): > ASoC: max9860: switch to SPDX license tag This one didn't turn up yet - it's only just been sent though so it might be stuck in a mail queue somewhere, I've applied patch 2 and I expect I'll apply this one as soon as it appears.
On Fri, Apr 13, 2018 at 12:19:27PM +0100, Mark Brown wrote: > On Thu, Apr 12, 2018 at 11:14:35PM +0200, Peter Rosin wrote: > > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > /* > > * Driver for the MAX9860 Mono Audio Voice Codec > > * > > Please don't mix C and C++ comments like this - it looks unintentional > and messy. Just convert the entire comment block to C++ so it's > consistent with itself. NAK - that is exactky the wrong way to go. Normal Linux comments are classi C-style comments and should remain so. SPDX tags use c++ comments exactly to be different and stick out. ---end quoted text---
On Sun, Apr 15, 2018 at 12:32:29AM -0700, Christoph Hellwig wrote: > On Fri, Apr 13, 2018 at 12:19:27PM +0100, Mark Brown wrote: > > On Thu, Apr 12, 2018 at 11:14:35PM +0200, Peter Rosin wrote: > > > @@ -1,3 +1,4 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > /* > > > * Driver for the MAX9860 Mono Audio Voice Codec > > > * > > Please don't mix C and C++ comments like this - it looks unintentional > > and messy. Just convert the entire comment block to C++ so it's > > consistent with itself. > NAK - that is exactky the wrong way to go. Normal Linux comments are > classi C-style comments and should remain so. SPDX tags use c++ > comments exactly to be different and stick out. During some of the discussions of the SPDX stuff Linus was expressing a willingness or desire to just use C++ comments where sensible outside of the SPDX headers, especially with single line stuff though this seems like another useful exception. Quite why we'd particularly need to have the SPDX stuff sticking out isn't really obvious either; there's the desire to have something very consistent to ease machine parsing but it's not exactly what I'd expect most humans to be first looking for when they open a source file.
diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c index 53448b7b7b28..21c70cd5dcf6 100644 --- a/sound/soc/codecs/max9860.c +++ b/sound/soc/codecs/max9860.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for the MAX9860 Mono Audio Voice Codec * @@ -8,15 +9,6 @@ * * Author: Peter Rosin <peda@axentia.s> * Copyright 2016 Axentia Technologies - * - * 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 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. */ #include <linux/init.h> diff --git a/sound/soc/codecs/max9860.h b/sound/soc/codecs/max9860.h index 22041bd67a7d..e07b905eaf50 100644 --- a/sound/soc/codecs/max9860.h +++ b/sound/soc/codecs/max9860.h @@ -1,17 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Driver for the MAX9860 Mono Audio Voice Codec * * Author: Peter Rosin <peda@axentia.s> * Copyright 2016 Axentia Technologies - * - * 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 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. */ #ifndef _SND_SOC_MAX9860
It's less overhead, clearer and generally neater. Signed-off-by: Peter Rosin <peda@axentia.se> --- sound/soc/codecs/max9860.c | 10 +--------- sound/soc/codecs/max9860.h | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-)