From patchwork Mon Aug 20 03:26:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 144545 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3466112ljj; Sun, 19 Aug 2018 20:27:37 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzfxGjuP16jIWpzIV1Fjtz7Os5GQcz2oznbKYHWqmraLHTWGPDYCZpsjkdRxqfY2ENejsZK X-Received: by 2002:a17:902:e204:: with SMTP id ce4-v6mr26971674plb.310.1534735657797; Sun, 19 Aug 2018 20:27:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534735657; cv=none; d=google.com; s=arc-20160816; b=stjz8ftk64QQZUuxpQCrHYYWwMgYEyHCbKolaU+mPvVOsc2dimtv8dlMFMvTosmUW4 Nv/KVvMIOYXSG8flc8+ke693eI1CHd0G/N5v7HOeBmy1rBs/Utgb+hrTa77j/juwYqxO rc3RFsNbEOC/OCmxqSH0VR/8cUvJEb27zn1r3k+lri5LwBcHNXNEf0vGyroVpogqMAmC J7kBk19fm7RlsvixNHykujWOjoehZ0KG5BmSMMKzipU4z9Pq25b41pTdzOmHApMNVtbl FQUL7u759oK8YCt06ZtawHjMQxgaRs4YcSqB7SnQWvx72SiCdR/95g+CrMCJpMlLv9Y+ jZJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:dkim-filter:dkim-signature :arc-authentication-results; bh=5AkykHXx3dcYsZCARpP3/bLamIZzsJSXfBlYYw0W9V4=; b=wzz+yF2sSVqsOqHQ6jX9j1V20AsLxw4byW2HQVjhSON1R+czIbULbqQJikeCw6gJiV MInApLuP/+2JpQ0L0KwaaS0WdEAka4gdDSLYvz3wMVpHk/RryDcwTeEMyRT5AkOJDSZj 3QFRnNJDdYQjiMy9I7mg36hyDEXbqlC93FzhKCzmaXjdaRuYcDNxHHCAJgGWPnRg1Txj neIGDPgHU8YGczs9GAteecXKGOgQpLlyo2OaRK40WroY+4XoCN0t3KC34pkieHcLhgIQ 7mt6Wd6yfqJNdjLxPCWpE8s48pbFVEeQ1SgDAY4YRez9BNOIbb65r8Xe9pO31+MkwKTf sZ5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b=h7q46SkK; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=yNFaO2WU; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org" Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id i61-v6si8771477plb.209.2018.08.19.20.27.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 19 Aug 2018 20:27:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b=h7q46SkK; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=yNFaO2WU; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5AkykHXx3dcYsZCARpP3/bLamIZzsJSXfBlYYw0W9V4=; b=h7q46SkKeYKHgC n1eT878PAcP1wQZ3o6ukelYOr25iqm8Rxwu0efoeit9zFuygbqtpwne2Mn1aRJ+8gtBDS3mJ3Nc6i KBfPd/mpOqjY0+Iyv0pDBVHXuck6iLhGoBnQ8BVl37BH59/oOnu+ITwcpDD8WFyO1fhFCh9B6ubxQ 07i6gqyo4DUqq99Vqnf1l/7h47zJC4XQoVYRyFxxD0j3oGhbS5jfUU34L/kN2TrT3C0kl1nxSn5cY YzJbQcAQGDFzbSm81D+QqEFoG5PNPHzyc6UjyxSJIZ1Xtop2yMTC8Ht9rGKrnhNNrPMqTXakx/p7j 6nxVdmkP1E3WVmLr1LQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fraqg-0005NT-3F; Mon, 20 Aug 2018 03:27:22 +0000 Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fraqb-0005Ku-TR for linux-mtd@lists.infradead.org; Mon, 20 Aug 2018 03:27:20 +0000 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w7K3QcAM011579; Mon, 20 Aug 2018 12:26:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w7K3QcAM011579 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534735599; bh=RlB/wWU/t7Xo8JtNgmqgzNLDbxhHJRwseOJB9ScQOyg=; h=From:To:Cc:Subject:Date:From; b=yNFaO2WU60M83T38gcTCa4r3erPFX5Ye3NLRhqVGT+1urs5qPYvcW4IDooqyA+xru RoIk4+vGZEhpIBAUH90J1MWZUJ9a29a3XBwUheUbITjytnqAiseKxaQmCJPx3K+yQJ AyNb2aQ6XFDKX4C6yLL7cXTkLeaPEYxZZNYZXYSdp/DPtbk2AZJnSR8z6kTQQwBL0b rY0KY8xQwXWJUjYtmAUB9394FMmvSWpbwTjgBES0+baU34/PAoK2S7DPNAS28oTJDi QHr0V53Xghk+rZLEmhzsvi371DvgNhfJbodyYshdcFh9KBVHnxa1rpWH6zbW2QxkXX C9f4zSa1MTPOA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org, Boris Brezillon , Miquel Raynal Subject: [PATCH] mtd: nand: denali: use SPDX-License-Identifier and fix license mismatch Date: Mon, 20 Aug 2018 12:26:36 +0900 Message-Id: <1534735596-10876-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180819_202718_294944_E65695A8 X-CRM114-Status: GOOD ( 14.98 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [210.131.2.76 listed in list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Masahiro Yamada , Richard Weinberger , linux-kernel@vger.kernel.org, Dinh Nguyen , Brian Norris , David Woodhouse Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org Use SPDX-License-Identifier instead of the license boilerplates. This conversion makes it easier for us to scan the license, then I notice license mismatch problems. The license blocks in denali* indicate GPL-2.0 "only", while the MODULE_LICENSE in denali.c and denali_dt.c is GPL-2.0 "or later" as explained in include/linux/module.h as follows: "GPL" [GNU Public License v2 or later] "GPL v2" [GNU Public License v2] I fixed the MODULE_LICENSE tags, assuming the license blocks are the authors' intention. Also, add missing MODULE_DESCRIPTION/AUTHOR to denali.c While I am touching the license things, I added my credit to denali.c because this driver was largely re-written by me in 2017. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/raw/denali.c | 17 +++++++---------- drivers/mtd/nand/raw/denali.h | 10 +--------- drivers/mtd/nand/raw/denali_dt.c | 12 ++---------- drivers/mtd/nand/raw/denali_pci.c | 10 +--------- 4 files changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index ca18612..9f432f0 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1,15 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NAND Flash Controller Device Driver * Copyright © 2009-2010, Intel Corporation and its suppliers. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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. + * Copyright (c) 2017 Socionext Inc. + * Reworked by Masahiro Yamada */ #include @@ -25,8 +20,6 @@ #include "denali.h" -MODULE_LICENSE("GPL"); - #define DENALI_NAND_NAME "denali-nand" /* for Indexed Addressing */ @@ -1396,3 +1389,7 @@ void denali_remove(struct denali_nand_info *denali) denali_disable_irq(denali); } EXPORT_SYMBOL(denali_remove); + +MODULE_DESCRIPTION("Driver core for Denali NAND controller"); +MODULE_AUTHOR("Intel Corporation and its suppliers"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mtd/nand/raw/denali.h b/drivers/mtd/nand/raw/denali.h index 1f8feaf..57a5498 100644 --- a/drivers/mtd/nand/raw/denali.h +++ b/drivers/mtd/nand/raw/denali.h @@ -1,15 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * NAND Flash Controller Device Driver * Copyright (c) 2009 - 2010, Intel Corporation and its suppliers. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 __DENALI_H__ diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index 0faaad0..7c6a8a4 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NAND Flash Controller Device Driver for DT * * Copyright © 2011, Picochip. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 @@ -202,6 +194,6 @@ static struct platform_driver denali_dt_driver = { }; module_platform_driver(denali_dt_driver); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Jamie Iles"); MODULE_DESCRIPTION("DT driver for Denali NAND controller"); diff --git a/drivers/mtd/nand/raw/denali_pci.c b/drivers/mtd/nand/raw/denali_pci.c index 7c8efc4..48e9ac5 100644 --- a/drivers/mtd/nand/raw/denali_pci.c +++ b/drivers/mtd/nand/raw/denali_pci.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NAND Flash Controller Device Driver * Copyright © 2009-2010, Intel Corporation and its suppliers. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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