From patchwork Fri Sep 7 01:31:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10591461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A137A920 for ; Fri, 7 Sep 2018 01:31:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F3612B14E for ; Fri, 7 Sep 2018 01:31:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83ACA2B138; Fri, 7 Sep 2018 01:31:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA3A52B14E for ; Fri, 7 Sep 2018 01:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728205AbeIGGJq (ORCPT ); Fri, 7 Sep 2018 02:09:46 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:19280 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726026AbeIGGJp (ORCPT ); Fri, 7 Sep 2018 02:09:45 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 07 Sep 2018 10:31:21 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 5440B40492; Fri, 7 Sep 2018 10:31:21 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,340,1531753200"; d="scan'208";a="290231901" Received: from mail-os2jpn01lp0147.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.147]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 07 Sep 2018 10:31:21 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H8/hGKSihGDRN7lIcPHnMUBh8s0jkamM5ydTQHTDsqs=; b=HssSYUQ7j53P70/La9NPzmUoYg/pZaj/+CgZjco/zpvC/SUteLn09Bb4dN6XbzQwYTBJalC6gWZIbO/VOU/8T3ujKUHlPB9rrXCo7ptgdrghfLPZWDRdNhNQJSfj4Ihbd+VPHCbpaNVipLHAxuZpiA39W50YPTByxyThdOd7RdU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TY1PR01MB1866.jpnprd01.prod.outlook.com (2603:1096:403:2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.16; Fri, 7 Sep 2018 01:31:19 +0000 Message-ID: <871sa6rtfg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 resend 02/13] sh: drivers: convert to SPDX identifiers User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Yoshinori Sato , Rich Felker Cc: Linux-SH , Linux-Renesas In-Reply-To: <874lf2rtgt.wl-kuninori.morimoto.gx@renesas.com> References: <874lf2rtgt.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 7 Sep 2018 01:31:19 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: KAXPR01CA0039.jpnprd01.prod.outlook.com (2603:1096:402:1a::25) To TY1PR01MB1866.jpnprd01.prod.outlook.com (2603:1096:403:2::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31e71ffe-5e6a-4b55-e87b-08d614619c9e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:TY1PR01MB1866; X-Microsoft-Exchange-Diagnostics: 1;TY1PR01MB1866;3:9tGOChL7xJvNHeAezJizBihNEoyf/H/h6bit8mEWakmeC/X+jMMazv2RXsHRCkSpHjtG8AO8XgoKDtGANZ6NMxv7522YO34oZ/6buhF1xWoB+peoAf70oQ4NrI7MhL76Jq6B/C/oRdqISTBK8v5c5kt6ZOPEdnMT3fmBWUjKJsNZ0xFmaedzwVOGcMZzBt1FL0C8x2wZTWR4FCJneZuwNr5I17fy1vGuNwObpd5c/SoYkNojYK60bObPrFOG6JUb;25:dRk+pHQ3mT9L8mkiCT1dnWLvwsW45zDYE8ZdQtjk4Dr41/Qr/0rAkKFshWqY8wVx4eOVsr3TqgY4bAdBHFHiOwhFoZ9fXw2y8WUtRvjHK+HK/QlXB4GPW3RjeAvAoQeFAgWF5xCdRv+N6i4Az7Nlq02Z6kBRTiz5zFq/ZgmBT+ckYC3PRBQJmNfS1yC1SNKrFBrP1v5OmVr96ROtQxaIHmu+cE174LvluTvxBbO1vLRCEiROo3qR0arNjR8WQY7xrpg/Bi3kpGBE/DmsR/QSBKfJufoRHd5JIZWl7fI0LBKMtyKfUiMG51QPlhPCY3b6s3QxHLpZZioITrzPN7AwsA==;31:959ID7Zv4EwH+GMmQP0e+BzMEP/85CQhbdzsyM2cFpAx5yxB6WXDv7p4Q8r0FPWhoXGN5gmsotyHmnCjz6WtNeAXhns6OqOf2nOjJPcfoDF8WQ1Ut7InhGmvIu1mlGIGHQDKB865pBYQIDDMcvIZOM5OKW4miLMM0wgueXIL8Olffpoas0/gXrCJkuHkcQ8FVvBJ558t2AsTEKvJuLGlgALF+kLxvLcpq8/yKEpmU+o= X-MS-TrafficTypeDiagnostic: TY1PR01MB1866: X-Microsoft-Exchange-Diagnostics: 1;TY1PR01MB1866;20:wWGm7uCDo/VtPrVgRqBjbc7vokbOgSXk9jFmht6diWQFKJDwYH4LdO2Sn4Or92Tzn2zhVGFU/LJYNGGLFC+eYKgdsXki4M6xv/cHwXXimfc8cyhiGASyovJ28gbw2gTlT3yly3IptkLxb84iE/S4NNbPKvfv1Nl+TCaUd5wVUpaUc0YBArW3XA/3qDi+gVlc6AXnXKaU0iyKphzupPkHQL1rMq/QDhVm/+Xi80nvG1qj1ZyY5rZuzR71MougjDWSBUlZdKSDoeu8837lOtc2jvR1z+uFyJ7/wmIpxsgn/P0aUxmATbgRYrJWOT1fkJmraUBybe5JFyclUyFaCHxWin0Wpc3X+yyR/vUBFpAFNccOmfJbjl//ErgP/aVwE37+rIM1vZgl/GNaQu6meYDD2ZkW3rKhvQA2dkJTFLPnrOiGqs4tVG4bQfJQTi5WvLVzKftWTkZ7UIuDP6hyysXEyzuwQ99Aduvue6JkOFv56YvSowMPTEF0Hd0FShHGYe6G;4:vHkUC/DCFHOKYuMFhwQaAqL8Q4A7y4dcJXFAyKdWPMnEGR/fiiXRXgb72qoZ+jdTtz1Omrb6zWcOftHTPjoSIuEMS1UMNh2HMIbz8JwRp7CAvVhKR3bK9uopUSFndIW5U8rsixRya04JOcJbbfcIDVutqf/s8yOE0zhpuXOlmfVE/SziMvJCuSLshBcoggCI4KF8SXNjX/JUpsueHe0UQEKtevtpit1BIRV/+6G2wkdgeoRYvz8CAm4hszW+dprsweZlYiQwzgGk0B0NGHaIlg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050);SRVR:TY1PR01MB1866;BCL:0;PCL:0;RULEID:;SRVR:TY1PR01MB1866; X-Forefront-PRVS: 07880C4932 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(39860400002)(396003)(346002)(376002)(366004)(136003)(189003)(199004)(53936002)(81156014)(4326008)(478600001)(316002)(5660300001)(6116002)(3846002)(6486002)(23726003)(69596002)(66066001)(52116002)(7696005)(76176011)(54906003)(16586007)(110136005)(58126008)(97736004)(47776003)(105586002)(50466002)(68736007)(106356001)(53416004)(2906002)(7736002)(305945005)(26005)(186003)(386003)(16526019)(86362001)(8936002)(575784001)(36756003)(8676002)(11346002)(446003)(25786009)(2616005)(81166006)(956004)(476003)(486006)(16060500001);DIR:OUT;SFP:1102;SCL:1;SRVR:TY1PR01MB1866;H:morimoto-PC.renesas.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;TY1PR01MB1866;23:KDRc+gqF40pOHlUteqt+Be8IalYu7XoFGqoayD7vaQLiKrrcX82ksHy0vO9C997w5yjfvAzXAllV0X6eEtnemA59kzmmbLME6OpvhQEzsSe7E2KcYIvsf/tu9HhQRMkYj3BYIBEtuXXF/SYZPTB7q584xmiQHofpFOlXu/wlRE7IQZ88iJYDhLsqn1svNPMd3Gv9BlHpW/89m3ZVVeZk50KC3L9qidmhuXhx2tpQQQVP+MScQ5CmWB8LZdFTOPBvZHY3cqwRnI4oCM9FRjyizEyLM+0gptnpYMuFehikePdd/RMmjIXl6qhgm0GB5cjnZT4YZRCQFo0lDKqlIsGojzKKNzayLu62DzbnW86Xf2WnqNOTXo05qD6L6/6gFNEgJN4/Vv1lySD7yn5zsngoFsKeoBbHzjUaTe0EQFFxcr+9+XfQ7nOwcj7G8nhAVSDMc2cv4gzL/3SG0uVnWg43rURjL2h4s99A26t7DrFsbylx2QYwlJI/a/M2JTurko7hT9A6aEee0KxjgLf4vAXELwY1oHqaWKJWVh1fhfo01zwTeinqag82sVFFMmToyIX3u8iXnRvGo3X56ordY5kK8V67eC4zwEl4BSY09ajXn7CVmJQaIpttk32ye2dNFUhq7bjopmetnamG2FwyGWyxbtNviNW6DZWKZbGUXIuRzsqlZIcUXdulCAe0dNe0acRv3jZWMrbyLphk6wzHcGu2JBdfbH3I7uY7QROESrxYO96ET8VxkqnKB7le0exXAvCdZuUKTXTtdODZq641FedpN5ThZCubu5KxcIm33myaE52S00aYsdDBP9qmSas1p1YxHbvplhEq8+pY7+w0UW2ruGta15tmaABYnw4MIlTmTZW+KIoJjOn4EBSe458pp8fOCZ3FKhJl+Ffh8KUcPcz5Wcb2CfXgqs3JKWKx/LRV6uDlFbmAYD/EQY/RuSiUJEpbKZtoil5Qr1P8p0qHRNCKfEjjr4lZh4u5huepT1CpW2GIu7cIdxTjhHgpIVX0vIl1hOQ4jX+Qa5MGcyOU5h+7EokoMJ67TnLVqAZjn9v9UqxYA8FYEJZ7EE0DcWpIbJ2CTjnx2NzBDKZOh6GzNrcoXjK0jX73RL7pSLsc66J9pqA4sd7cm5di2fgC2+ijh4aZeZ/TGX8reJhYgKQaxcAtdI3fM36y3G1mAW08vsziMguFu4MAcygQ4MxIGjFf5ix24tsniQ18jtfYrH4Ba+29PQ== X-Microsoft-Antispam-Message-Info: 9X8q9ugf89BYdDdOB+kSU1fVFVryC/sIigvDL7FLr1VjDvcCQvM00SOLvY1EYA4evb5Tjjf+hs1VWO0diOOdKUd5zxft0TxRoTiIl+PK3a4J3RrX5G1qqBsduA05Gnm9bOQxyjfVy8OA/RIpkHQQkrL7kR6NuTZGayj2H9Mo9RdtCZiI+4wROzcwdsz0HrZcHUELXfCzAmbPaQwMuH9L/inAqCftCnTwB0wmAo7q5dqKyrbhkTBrNRtxtWpUJmiTlljw8qiPeLvu82mqn37W5uZDyleKZyiFMZQ83fh+X6f0OwzowGKjBo4mk1fobsG6G/tSuo7HTSjv7q9zXVya7qYDS3NuenD3IGFcJidKkV0= X-Microsoft-Exchange-Diagnostics: 1;TY1PR01MB1866;6:8xRN6aoyCG4CKzEEyrKqXmzMkL0WKtVHbxn91/VJeZPLlzfheDXoxZZMYG8TpTaNrNf6Lk156UVJyXOeftUVCviHX+Q0s9c+Wm2bz3u6Ih0vT2Z0xIYVt2GUhRWk3vl6fyO9l/WaKQKJemOfKTDIAgXnaaq/rdHrZ1cxr62nMjwC808Pfjf93q8vzfTPRRXIEk+j9cjCOgFCUgFRy2H2pjn9XbFdPHRJKq/i2ypdCkr9vTa/DItiC7XvgwLzmB89krtIhXyuwfOfd76fcVJbopgMYjVarzzXPfZAwRPiJbSb1qtBnWB7iVzFCXhIA0cwSfLN4dTS0y/hBwOXZi6Zo9y+XaP1p8tpMGrs25/+jD/di29S77r9cijVvd2+2SHNdI20eAUHU7V+Rf56ZjXcYY7Ih8bMwGqauz/Tb1jKZFFJ7j4b4eLgdv+xVJQzKm+JcRZyagUl9gh29iaqsGJCOA==;5:FCOGygv+f6lmIFUwgVWRb7v6eLYLEj4y3T5oWk/ZO5R6CYcSzFJkN6YePHXEtRh01o3A2hHPR0OpECHDGBOoHetobX7Mzdux932vGzNweBQvKxcVHeHhs2YZ5BtkwYX16XiHV7ROcI/7/cXBkNRZFpCXoePJOLpmlrgNwe2GFzo=;7:K5TwO25FWCbWcLvIpC2JFA5249r5PqQTUSoAPNkpuNATu+K4yFNfr//vihV0BovJBEbY9fL0dwkk201JUtMdTyTVSMsS5HB8AbxCWAA2npvzWZK6Yyuyy5jaVT29bmZyPn+xnLc1C6HVfxNzH09NE8Gf4fWlKWF+3VKrSgkDD1VG97gR8PDUrDTXVWD3SMGo1xB5O2wrbV2KpaWn+ndhAjecY0qJeZNkeuReaMzF653rM1xUxRCmn/MK/5GBYXCC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;TY1PR01MB1866;20:TMjszKFJWvz3eUrIHbzDgj3yeN9iggknLp4JxNvIv2rSNzQGXsalhQzStMki+x4LqvZYrbD6Nri3MbyeqYEMzRC82pgsJps1KHIqmAgAvKiIPxxXQlQHJi+X62qNKg2JPT+kL8dFICtE3wKgiT0XnipQcaiy20v8QfXRZgxXqN4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2018 01:31:19.0796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31e71ffe-5e6a-4b55-e87b-08d614619c9e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1866 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. As original license mentioned, it is GPL-2.0 in SPDX. Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". See ${LINUX}/include/linux/module.h "GPL" [GNU Public License v2 or later] "GPL v2" [GNU Public License v2] Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/drivers/dma/Makefile | 1 + arch/sh/drivers/dma/dma-api.c | 7 ++----- arch/sh/drivers/dma/dma-g2.c | 7 ++----- arch/sh/drivers/dma/dma-pvr2.c | 7 ++----- arch/sh/drivers/dma/dma-sh.c | 7 ++----- arch/sh/drivers/dma/dma-sysfs.c | 5 +---- arch/sh/drivers/dma/dmabrg.c | 3 +-- arch/sh/drivers/heartbeat.c | 5 +---- arch/sh/drivers/pci/fixups-dreamcast.c | 5 +---- arch/sh/drivers/pci/fixups-landisk.c | 4 +--- arch/sh/drivers/pci/fixups-r7780rp.c | 5 +---- arch/sh/drivers/pci/fixups-rts7751r2d.c | 5 +---- arch/sh/drivers/pci/fixups-sdk7780.c | 5 +---- arch/sh/drivers/pci/fixups-sdk7786.c | 5 +---- arch/sh/drivers/pci/fixups-snapgear.c | 4 +--- arch/sh/drivers/pci/fixups-titan.c | 4 +--- arch/sh/drivers/pci/ops-dreamcast.c | 5 +---- arch/sh/drivers/pci/ops-sh4.c | 5 +---- arch/sh/drivers/pci/ops-sh5.c | 4 +--- arch/sh/drivers/pci/ops-sh7786.c | 5 +---- arch/sh/drivers/pci/pci-dreamcast.c | 5 +---- arch/sh/drivers/pci/pci-sh5.c | 4 +--- arch/sh/drivers/pci/pci-sh5.h | 6 ++---- arch/sh/drivers/pci/pci-sh7751.c | 5 +---- arch/sh/drivers/pci/pci-sh7751.h | 7 ++----- arch/sh/drivers/pci/pci-sh7780.c | 5 +---- arch/sh/drivers/pci/pci-sh7780.h | 7 ++----- arch/sh/drivers/pci/pci.c | 5 +---- arch/sh/drivers/pci/pcie-sh7786.c | 5 +---- arch/sh/drivers/pci/pcie-sh7786.h | 7 ++----- arch/sh/drivers/push-switch.c | 5 +---- arch/sh/drivers/superhyway/Makefile | 1 + arch/sh/drivers/superhyway/ops-sh4-202.c | 5 +---- 33 files changed, 41 insertions(+), 124 deletions(-) diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile index d88c948..d2fdd56 100644 --- a/arch/sh/drivers/dma/Makefile +++ b/arch/sh/drivers/dma/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the SuperH DMA specific kernel interface routines under Linux. # diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c index b05be59..ab91704 100644 --- a/arch/sh/drivers/dma/dma-api.c +++ b/arch/sh/drivers/dma/dma-api.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/dma/dma-api.c * * SuperH-specific DMA management API * * Copyright (C) 2003, 2004, 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include @@ -417,4 +414,4 @@ subsys_initcall(dma_api_init); MODULE_AUTHOR("Paul Mundt "); MODULE_DESCRIPTION("DMA API for SuperH"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c index e1ab6eb..52a8ae5 100644 --- a/arch/sh/drivers/dma/dma-g2.c +++ b/arch/sh/drivers/dma/dma-g2.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/dma/dma-g2.c * * G2 bus DMA support * * Copyright (C) 2003 - 2006 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include @@ -197,4 +194,4 @@ module_exit(g2_dma_exit); MODULE_AUTHOR("Paul Mundt "); MODULE_DESCRIPTION("G2 bus DMA driver"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c index 706a343..b5dbd1f 100644 --- a/arch/sh/drivers/dma/dma-pvr2.c +++ b/arch/sh/drivers/dma/dma-pvr2.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/dma/dma-pvr2.c * * NEC PowerVR 2 (Dreamcast) DMA support * * Copyright (C) 2003, 2004 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include @@ -105,4 +102,4 @@ module_exit(pvr2_dma_exit); MODULE_AUTHOR("Paul Mundt "); MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index afde2a7..96c626c 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/dma/dma-sh.c * @@ -6,10 +7,6 @@ * Copyright (C) 2000 Takashi YOSHII * Copyright (C) 2003, 2004 Paul Mundt * Copyright (C) 2005 Andriy Skulysh - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include @@ -414,4 +411,4 @@ module_exit(sh_dmac_exit); MODULE_AUTHOR("Takashi YOSHII, Paul Mundt, Andriy Skulysh"); MODULE_DESCRIPTION("SuperH On-Chip DMAC Support"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 4b15fed..8ef3181 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/dma/dma-sysfs.c * * sysfs interface for SH DMA API * * Copyright (C) 2004 - 2006 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c index e5a57a1..5b2c1fd 100644 --- a/arch/sh/drivers/dma/dmabrg.c +++ b/arch/sh/drivers/dma/dmabrg.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SH7760 DMABRG IRQ handling * * (c) 2007 MSC Vertriebsges.m.b.H, Manuel Lauss - * licensed under the GPLv2. - * */ #include diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index e8af2ff..cf2fccc 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic heartbeat driver for regular LED banks * @@ -13,10 +14,6 @@ * traditionally used for strobing the load average. This use case is * handled by this driver, rather than giving each LED bit position its * own struct device. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index 48aaefd..dfdbd05 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/fixups-dreamcast.c * @@ -9,10 +10,6 @@ * This file originally bore the message (with enclosed-$): * Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp * Dreamcast PCI: Supports SEGA Broadband Adaptor only. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/drivers/pci/fixups-landisk.c b/arch/sh/drivers/pci/fixups-landisk.c index db5b40a..53fa2fc 100644 --- a/arch/sh/drivers/pci/fixups-landisk.c +++ b/arch/sh/drivers/pci/fixups-landisk.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/fixups-landisk.c * @@ -5,9 +6,6 @@ * * Copyright (C) 2006 kogiidena * Copyright (C) 2010 Nobuhiro Iwamatsu - * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. */ #include #include diff --git a/arch/sh/drivers/pci/fixups-r7780rp.c b/arch/sh/drivers/pci/fixups-r7780rp.c index 2c9b58f..3c9139c 100644 --- a/arch/sh/drivers/pci/fixups-r7780rp.c +++ b/arch/sh/drivers/pci/fixups-r7780rp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/fixups-r7780rp.c * @@ -5,10 +6,6 @@ * * Copyright (C) 2003 Lineo uSolutions, Inc. * Copyright (C) 2004 - 2006 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c index 358ac10..3f0a6fe 100644 --- a/arch/sh/drivers/pci/fixups-rts7751r2d.c +++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/fixups-rts7751r2d.c * @@ -6,10 +7,6 @@ * Copyright (C) 2003 Lineo uSolutions, Inc. * Copyright (C) 2004 Paul Mundt * Copyright (C) 2007 Nobuhiro Iwamatsu - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/fixups-sdk7780.c b/arch/sh/drivers/pci/fixups-sdk7780.c index 24e96df..c306040 100644 --- a/arch/sh/drivers/pci/fixups-sdk7780.c +++ b/arch/sh/drivers/pci/fixups-sdk7780.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/fixups-sdk7780.c * @@ -6,10 +7,6 @@ * Copyright (C) 2003 Lineo uSolutions, Inc. * Copyright (C) 2004 - 2006 Paul Mundt * Copyright (C) 2006 Nobuhiro Iwamatsu - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/fixups-sdk7786.c b/arch/sh/drivers/pci/fixups-sdk7786.c index 36eb6fc..8cbfa531 100644 --- a/arch/sh/drivers/pci/fixups-sdk7786.c +++ b/arch/sh/drivers/pci/fixups-sdk7786.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SDK7786 FPGA PCIe mux handling * * Copyright (C) 2010 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #define pr_fmt(fmt) "PCI: " fmt diff --git a/arch/sh/drivers/pci/fixups-snapgear.c b/arch/sh/drivers/pci/fixups-snapgear.c index a931e59..317225c 100644 --- a/arch/sh/drivers/pci/fixups-snapgear.c +++ b/arch/sh/drivers/pci/fixups-snapgear.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/ops-snapgear.c * @@ -7,9 +8,6 @@ * * Highly leveraged from pci-bigsur.c, written by Dustin McIntire. * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. - * * PCI initialization for the SnapGear boards */ #include diff --git a/arch/sh/drivers/pci/fixups-titan.c b/arch/sh/drivers/pci/fixups-titan.c index a9d563e..b5bb65c 100644 --- a/arch/sh/drivers/pci/fixups-titan.c +++ b/arch/sh/drivers/pci/fixups-titan.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/pci/ops-titan.c * @@ -6,9 +7,6 @@ * Modified from ops-snapgear.c written by David McCullough * Highly leveraged from pci-bigsur.c, written by Dustin McIntire. * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. - * * PCI initialization for the Titan boards */ #include diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index 16e0a1b..517a8a97 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCI operations for the Sega Dreamcast * * Copyright (C) 2001, 2002 M. R. Brown * Copyright (C) 2002, 2003 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c index b623420..a205be3 100644 --- a/arch/sh/drivers/pci/ops-sh4.c +++ b/arch/sh/drivers/pci/ops-sh4.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780). * * Copyright (C) 2002 - 2009 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License v2. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c index 4536194..9fbaf72 100644 --- a/arch/sh/drivers/pci/ops-sh5.c +++ b/arch/sh/drivers/pci/ops-sh5.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Support functions for the SH5 PCI hardware. * * Copyright (C) 2001 David J. Mckay (david.mckay@st.com) * Copyright (C) 2003, 2004 Paul Mundt * Copyright (C) 2004 Richard Curnow - * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. */ #include #include diff --git a/arch/sh/drivers/pci/ops-sh7786.c b/arch/sh/drivers/pci/ops-sh7786.c index 1284210..a10f9f4 100644 --- a/arch/sh/drivers/pci/ops-sh7786.c +++ b/arch/sh/drivers/pci/ops-sh7786.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic SH7786 PCI-Express operations. * * Copyright (C) 2009 - 2010 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License v2. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/pci-dreamcast.c b/arch/sh/drivers/pci/pci-dreamcast.c index 6336941..4cff2a8 100644 --- a/arch/sh/drivers/pci/pci-dreamcast.c +++ b/arch/sh/drivers/pci/pci-dreamcast.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCI support for the Sega Dreamcast * @@ -7,10 +8,6 @@ * This file originally bore the message (with enclosed-$): * Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp * Dreamcast PCI: Supports SEGA Broadband Adaptor only. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c index 8229114c..49303fa 100644 --- a/arch/sh/drivers/pci/pci-sh5.c +++ b/arch/sh/drivers/pci/pci-sh5.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2001 David J. Mckay (david.mckay@st.com) * Copyright (C) 2003, 2004 Paul Mundt * Copyright (C) 2004 Richard Curnow * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. - * * Support functions for the SH5 PCI hardware. */ diff --git a/arch/sh/drivers/pci/pci-sh5.h b/arch/sh/drivers/pci/pci-sh5.h index 3f01dec..91348af 100644 --- a/arch/sh/drivers/pci/pci-sh5.h +++ b/arch/sh/drivers/pci/pci-sh5.h @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2001 David J. Mckay (david.mckay@st.com) +/* SPDX-License-Identifier: GPL-2.0 * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. + * Copyright (C) 2001 David J. Mckay (david.mckay@st.com) * * Definitions for the SH5 PCI hardware. */ diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index 86adb1e..1b9e5ca 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Low-Level PCI Support for the SH7751 * @@ -5,10 +6,6 @@ * Copyright (C) 2001 Dustin McIntire * * With cleanup by Paul van Gool , 2003. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/pci-sh7751.h b/arch/sh/drivers/pci/pci-sh7751.h index 5ede38c..d1951e5 100644 --- a/arch/sh/drivers/pci/pci-sh7751.h +++ b/arch/sh/drivers/pci/pci-sh7751.h @@ -1,12 +1,9 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Low-Level PCI Support for SH7751 targets * * Dustin McIntire (dustin@sensoria.com) (c) 2001 * Paul Mundt (lethal@linux-sh.org) (c) 2003 - * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. - * */ #ifndef _PCI_SH7751_H_ diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c index 5a6dab6..3fd0f39 100644 --- a/arch/sh/drivers/pci/pci-sh7780.c +++ b/arch/sh/drivers/pci/pci-sh7780.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Low-Level PCI Support for the SH7780 * * Copyright (C) 2005 - 2010 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h index 1742e2c..e2ac770 100644 --- a/arch/sh/drivers/pci/pci-sh7780.h +++ b/arch/sh/drivers/pci/pci-sh7780.h @@ -1,12 +1,9 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Low-Level PCI Support for SH7780 targets * * Dustin McIntire (dustin@sensoria.com) (c) 2001 * Paul Mundt (lethal@linux-sh.org) (c) 2003 - * - * May be copied or modified under the terms of the GNU General Public - * License. See linux/COPYING for more information. - * */ #ifndef _PCI_SH7780_H_ diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 8256626..c7784e1 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * New-style PCI core. * @@ -6,10 +7,6 @@ * * Modelled after arch/mips/pci/pci.c: * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org) - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c index 3d81a8b..a58b77c 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Low-Level PCI Express Support for the SH7786 * * Copyright (C) 2009 - 2011 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #define pr_fmt(fmt) "PCI: " fmt diff --git a/arch/sh/drivers/pci/pcie-sh7786.h b/arch/sh/drivers/pci/pcie-sh7786.h index 4a6ff55..ffe3836 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.h +++ b/arch/sh/drivers/pci/pcie-sh7786.h @@ -1,12 +1,9 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * SH7786 PCI-Express controller definitions. * * Copyright (C) 2008, 2009 Renesas Technology Corp. * All rights reserved. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #ifndef __PCI_SH7786_H #define __PCI_SH7786_H diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c index 762bc56..2813140 100644 --- a/arch/sh/drivers/push-switch.c +++ b/arch/sh/drivers/push-switch.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic push-switch framework * * Copyright (C) 2006 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/drivers/superhyway/Makefile b/arch/sh/drivers/superhyway/Makefile index 5b8e0c7..aa6e326 100644 --- a/arch/sh/drivers/superhyway/Makefile +++ b/arch/sh/drivers/superhyway/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the SuperHyway specific kernel interface routines under Linux. # diff --git a/arch/sh/drivers/superhyway/ops-sh4-202.c b/arch/sh/drivers/superhyway/ops-sh4-202.c index 6da62e9..4901422 100644 --- a/arch/sh/drivers/superhyway/ops-sh4-202.c +++ b/arch/sh/drivers/superhyway/ops-sh4-202.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/drivers/superhyway/ops-sh4-202.c * * SuperHyway bus support for SH4-202 * * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU - * General Public License. See the file "COPYING" in the main - * directory of this archive for more details. */ #include #include