| Message ID | 878t4eqdkw.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | dma: sh: convert to SPDX identifiers | expand |
On Fri, Sep 07, 2018 at 01:58:59AM +0000, Kuninori Morimoto wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch updates license to use SPDX-License-Identifier > instead of verbose license text. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
On 07-09-18, 01:58, Kuninori Morimoto wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch updates license to use SPDX-License-Identifier > instead of verbose license text. Thanks but the style is not consistent in files :( Can we use one only? > diff --git a/drivers/dma/sh/shdma-arm.h b/drivers/dma/sh/shdma-arm.h > index a1b0ef4..30bcfe3 100644 > --- a/drivers/dma/sh/shdma-arm.h > +++ b/drivers/dma/sh/shdma-arm.h > @@ -1,11 +1,8 @@ > -/* > +/* SPDX-License-Identifier: GPL-2.0 this is one > #ifndef SHDMA_ARM_H > diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c > index 6b5626e..c51de49 100644 > --- a/drivers/dma/sh/shdma-base.c > +++ b/drivers/dma/sh/shdma-base.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 different > diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h > index 2c0a969..73aec72 100644 > --- a/drivers/dma/sh/shdma.h > +++ b/drivers/dma/sh/shdma.h > @@ -1,14 +1,9 @@ > -/* > +/* SPDX-License-Identifier: GPL-2.0+ this and so on..
Hi Vinod, On Tue, Sep 11, 2018 at 9:48 AM Vinod <vkoul@kernel.org> wrote: > On 07-09-18, 01:58, Kuninori Morimoto wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > This patch updates license to use SPDX-License-Identifier > > instead of verbose license text. > > Thanks but the style is not consistent in files :( > > Can we use one only? Please read https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/license-rules.rst#n69 2. Style: The SPDX license identifier is added in form of a comment. The comment style depends on the file type:: C source: // SPDX-License-Identifier: <SPDX License Expression> C header: /* SPDX-License-Identifier: <SPDX License Expression> */ Gr{oetje,eeting}s, Geert
Hi Vinod > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > > > This patch updates license to use SPDX-License-Identifier > > > instead of verbose license text. > > > > Thanks but the style is not consistent in files :( > > > > Can we use one only? > > Please read > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/license-rules.rst#n69 > > 2. Style: > > The SPDX license identifier is added in form of a comment. The comment > style depends on the file type:: > > C source: // SPDX-License-Identifier: <SPDX License Expression> > C header: /* SPDX-License-Identifier: <SPDX License Expression> */ > > Gr{oetje,eeting}s, And this, too https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/license-rules.rst#n15 GPL-1.0+ : GNU General Public License v1.0 or later GPL-2.0+ : GNU General Public License v2.0 or later LGPL-2.0 : GNU Library General Public License v2 only LGPL-2.0+ : GNU Library General Public License v2 or later LGPL-2.1 : GNU Lesser General Public License v2.1 only LGPL-2.1+ : GNU Lesser General Public License v2.1 or later Best regards --- Kuninori Morimoto
On 11-09-18, 10:17, Geert Uytterhoeven wrote: > Hi Vinod, > > On Tue, Sep 11, 2018 at 9:48 AM Vinod <vkoul@kernel.org> wrote: > > On 07-09-18, 01:58, Kuninori Morimoto wrote: > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > > > This patch updates license to use SPDX-License-Identifier > > > instead of verbose license text. > > > > Thanks but the style is not consistent in files :( > > > > Can we use one only? > > Please read > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/license-rules.rst#n69 > > 2. Style: > > The SPDX license identifier is added in form of a comment. The comment > style depends on the file type:: > > C source: // SPDX-License-Identifier: <SPDX License Expression> > C header: /* SPDX-License-Identifier: <SPDX License Expression> */ Right and I missed patch is doing for both c & h files, my bad Applying this now. Btw I have sent the series for dma_slave_config direction removal, sh/ drivers turned to be bit more, can you guys take care of it please?
Hi Vinod, On Wed, Sep 12, 2018 at 11:43 AM Vinod <vkoul@kernel.org> wrote: > Btw I have sent the series for dma_slave_config direction removal, sh/ > drivers turned to be bit more, can you guys take care of it please? I'm sorry, I can't seem to find that. Can you please provide a link to the patch series? Thanks! Gr{oetje,eeting}s, Geert
On 12-09-18, 14:05, Geert Uytterhoeven wrote: > Hi Vinod, > > On Wed, Sep 12, 2018 at 11:43 AM Vinod <vkoul@kernel.org> wrote: > > Btw I have sent the series for dma_slave_config direction removal, sh/ > > drivers turned to be bit more, can you guys take care of it please? > > I'm sorry, I can't seem to find that. I though I had Cced renesas folks including you, but looks like I missed you, apologies > Can you please provide a link to the patch series? https://www.spinics.net/lists/dmaengine/msg16551.html Thanks
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig index 6e0685f..1c46754 100644 --- a/drivers/dma/sh/Kconfig +++ b/drivers/dma/sh/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # DMA engine configuration for sh # diff --git a/drivers/dma/sh/shdma-arm.h b/drivers/dma/sh/shdma-arm.h index a1b0ef4..30bcfe3 100644 --- a/drivers/dma/sh/shdma-arm.h +++ b/drivers/dma/sh/shdma-arm.h @@ -1,11 +1,8 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Renesas SuperH DMA Engine support * * Copyright (C) 2013 Renesas Electronics, Inc. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of version 2 the GNU General Public License as published by the Free - * Software Foundation. */ #ifndef SHDMA_ARM_H diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index 6b5626e..c51de49 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Dmaengine driver base library for DMA controllers, found on SH-based SoCs * @@ -7,10 +8,6 @@ * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved. * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. */ #include <linux/delay.h> diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c index f999f9b..be89dd8 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SHDMA Device Tree glue * * Copyright (C) 2013 Renesas Electronics Inc. * Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de> - * - * This is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. */ #include <linux/dmaengine.h> diff --git a/drivers/dma/sh/shdma-r8a73a4.c b/drivers/dma/sh/shdma-r8a73a4.c index 96ea382..ddc9a35 100644 --- a/drivers/dma/sh/shdma-r8a73a4.c +++ b/drivers/dma/sh/shdma-r8a73a4.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs * * Copyright (C) 2013 Renesas Electronics, Inc. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of version 2 the GNU General Public License as published by the Free - * Software Foundation. */ #include <linux/sh_dma.h> diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h index 2c0a969..73aec72 100644 --- a/drivers/dma/sh/shdma.h +++ b/drivers/dma/sh/shdma.h @@ -1,14 +1,9 @@ -/* +/* SPDX-License-Identifier: GPL-2.0+ + * * Renesas SuperH DMA Engine support * * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved. - * - * This 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. - * */ #ifndef __DMA_SHDMA_H #define __DMA_SHDMA_H diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 04a74e0..88b1eb8 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Renesas SuperH DMA Engine support * @@ -8,14 +9,8 @@ * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved. * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved. * - * This 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. - * * - DMA of SuperH does not have Hardware DMA chain mode. * - MAX DMA size is 16MB. - * */ #include <linux/delay.h> diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c index 69b9564..30cc355 100644 --- a/drivers/dma/sh/sudmac.c +++ b/drivers/dma/sh/sudmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas SUDMAC support * @@ -8,10 +9,6 @@ * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved. * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. */ #include <linux/dmaengine.h> diff --git a/drivers/dma/sh/usb-dmac.c b/drivers/dma/sh/usb-dmac.c index 1bb1a8e..7f7184c 100644 --- a/drivers/dma/sh/usb-dmac.c +++ b/drivers/dma/sh/usb-dmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Renesas USB DMA Controller Driver * @@ -6,10 +7,6 @@ * based on rcar-dmac.c * Copyright (C) 2014 Renesas Electronics Inc. * Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com> - * - * This is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. */ #include <linux/delay.h> diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index d927647..6dfd05e 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h @@ -1,4 +1,5 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Dmaengine driver base library for DMA controllers, found on SH-based SoCs * * extracted from shdma.c and headers @@ -7,10 +8,6 @@ * Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> * Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved. * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. */ #ifndef SHDMA_BASE_H