| Message ID | 1525288709-7934-2-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4c23e486e9d96915f45967b0adaa278b618f7236 |
| Headers | show |
On 05/02/2018 09:18 PM, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Adopt the SPDX license identifier headers to ease license compliance > management. > > Cc: Marek Vasut <marex@denx.de> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > drivers/spi/spi-mxs.c | 48 +++++++++++++++++++----------------------------- > 1 file changed, 19 insertions(+), 29 deletions(-) > > diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c > index 3d216b9..6ac95a2 100644 > --- a/drivers/spi/spi-mxs.c > +++ b/drivers/spi/spi-mxs.c > @@ -1,32 +1,22 @@ > -/* > - * Freescale MXS SPI master driver > - * > - * Copyright 2012 DENX Software Engineering, GmbH. > - * Copyright 2012 Freescale Semiconductor, Inc. > - * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. > - * > - * Rework and transition to new API by: > - * Marek Vasut <marex@denx.de> > - * > - * Based on previous attempt by: > - * Fabio Estevam <fabio.estevam@freescale.com> > - * > - * Based on code from U-Boot bootloader by: > - * Marek Vasut <marex@denx.de> > - * > - * Based on spi-stmp.c, which is: > - * Author: Dmitry Pervushin <dimka@embeddedalley.com> > - * > - * 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+ > +// > +// Freescale MXS SPI master driver > +// > +// Copyright 2012 DENX Software Engineering, GmbH. > +// Copyright 2012 Freescale Semiconductor, Inc. > +// Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. This C++ comment is horrid, I really hate it. If you want the first line to be a C++ comment, while I find that terrible, I guess that's what was forced upon everyone, but why make this whole block into a C++ comment ? I don't think that is needed.
Hi Marek, On Wed, May 2, 2018 at 4:25 PM, Marek Vasut <marex@denx.de> wrote: > This C++ comment is horrid, I really hate it. If you want the first line > to be a C++ comment, while I find that terrible, I guess that's what was > forced upon everyone, but why make this whole block into a C++ comment ? > I don't think that is needed. I understand your point, but this is the style that Mark prefers: https://www.spinics.net/lists/alsa-devel/msg77523.html -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/03/2018 01:51 AM, Fabio Estevam wrote: > Hi Marek, > > On Wed, May 2, 2018 at 4:25 PM, Marek Vasut <marex@denx.de> wrote: > >> This C++ comment is horrid, I really hate it. If you want the first line >> to be a C++ comment, while I find that terrible, I guess that's what was >> forced upon everyone, but why make this whole block into a C++ comment ? >> I don't think that is needed. > > I understand your point, but this is the style that Mark prefers: > https://www.spinics.net/lists/alsa-devel/msg77523.html You are linking to your own post, so that's not much of a proof ;) Whatever Mark prefers, but honestly I fail to see why this C++ comment style ever crawled in.
On Thu, May 03, 2018 at 01:55:11AM +0200, Marek Vasut wrote: > Whatever Mark prefers, but honestly I fail to see why this C++ comment > style ever crawled in. Honestly I'm not a big fan of the C++ comments either, I still don't understand why we didn't just do something more like MODULE_LICENSE which is a lot less ugly. Like Fabio says if we have to have C++ comments I prefer the whole block being a C++ comment so it at least looks a bit more intentional.
On 05/03/2018 03:26 AM, Mark Brown wrote: > On Thu, May 03, 2018 at 01:55:11AM +0200, Marek Vasut wrote: > >> Whatever Mark prefers, but honestly I fail to see why this C++ comment >> style ever crawled in. > > Honestly I'm not a big fan of the C++ comments either, I still don't > understand why we didn't just do something more like MODULE_LICENSE > which is a lot less ugly. Because the licensing information has to be per-file, so companies can easily recycle the code and be safe about the license I guess ? > Like Fabio says if we have to have C++ > comments I prefer the whole block being a C++ comment so it at least > looks a bit more intentional. >
On Thu, May 03, 2018 at 11:46:52AM +0200, Marek Vasut wrote: > On 05/03/2018 03:26 AM, Mark Brown wrote: > > Honestly I'm not a big fan of the C++ comments either, I still don't > > understand why we didn't just do something more like MODULE_LICENSE > > which is a lot less ugly. > Because the licensing information has to be per-file, so companies can > easily recycle the code and be safe about the license I guess ? I mean the format, not the specific macro. It looks a lot less messy.
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 3d216b9..6ac95a2 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -1,32 +1,22 @@ -/* - * Freescale MXS SPI master driver - * - * Copyright 2012 DENX Software Engineering, GmbH. - * Copyright 2012 Freescale Semiconductor, Inc. - * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. - * - * Rework and transition to new API by: - * Marek Vasut <marex@denx.de> - * - * Based on previous attempt by: - * Fabio Estevam <fabio.estevam@freescale.com> - * - * Based on code from U-Boot bootloader by: - * Marek Vasut <marex@denx.de> - * - * Based on spi-stmp.c, which is: - * Author: Dmitry Pervushin <dimka@embeddedalley.com> - * - * 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+ +// +// Freescale MXS SPI master driver +// +// Copyright 2012 DENX Software Engineering, GmbH. +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. +// +// Rework and transition to new API by: +// Marek Vasut <marex@denx.de> +// +// Based on previous attempt by: +// Fabio Estevam <fabio.estevam@freescale.com> +// +// Based on code from U-Boot bootloader by: +// Marek Vasut <marex@denx.de> +// +// Based on spi-stmp.c, which is: +// Author: Dmitry Pervushin <dimka@embeddedalley.com> #include <linux/kernel.h> #include <linux/ioport.h>