From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH] gpu: gma500: remove unneeded DRIVER_LICENSE #define Date: Fri, 17 Nov 2017 15:16:32 +0100 Message-ID: <20171117141632.GA17880@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 174886E398 for ; Fri, 17 Nov 2017 14:16:27 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Patrik Jakobsson , David Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Philippe Ombredanne List-Id: dri-devel@lists.freedesktop.org VGhlcmUgaXMgbm8gbmVlZCB0byAjZGVmaW5lIHRoZSBsaWNlbnNlIG9mIHRoZSBkcml2ZXIsIGp1 c3QgcHV0IGl0IGluCnRoZSBNT0RVTEVfTElDRU5TRSgpIGxpbmUgZGlyZWN0bHkgYXMgYSB0ZXh0 IHN0cmluZy4KClRoaXMgYWxsb3dzIHRvb2xzIHRoYXQgY2hlY2sgdGhhdCB0aGUgbW9kdWxlIGxp Y2Vuc2UgbWF0Y2hlcyB0aGUgc291cmNlCmNvZGUgbGljZW5zZSB0byB3b3JrIHByb3Blcmx5LCBh cyB0aGVyZSBpcyBubyBuZWVkIHRvIHVud2luZCB0aGUKdW5uZWVkZWQgZGVyZWZlcmVuY2UsIGVz cGVjaWFsbHkgd2hlbiB0aGUgc3RyaW5nIGlzIGRlZmluZWQgaW4gYSAuaCBmaWxlCmZhciBhd2F5 IGZyb20gdGhlIC5jIGZpbGUgaXQgaXMgdXNlZCBpbi4KCkNjOiBQYXRyaWsgSmFrb2Jzc29uIDxw YXRyaWsuci5qYWtvYnNzb25AZ21haWwuY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxp bnV4LmllPgpSZXBvcnRlZC1ieTogUGhpbGlwcGUgT21icmVkYW5uZSA8cG9tYnJlZGFubmVAbmV4 Yi5jb20+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91 bmRhdGlvbi5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2dtYTUwMC9wc2JfZHJ2LmMgfCAyICst CiBkcml2ZXJzL2dwdS9kcm0vZ21hNTAwL3BzYl9kcnYuaCB8IDEgLQogMiBmaWxlcyBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZ21hNTAwL3BzYl9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9nbWE1MDAvcHNiX2Rydi5j CmluZGV4IDM3YTNiZTcxYWNkOS4uOGY1Y2MxZjQ3MWNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vZ21hNTAwL3BzYl9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL3BzYl9k cnYuYwpAQCAtNTI3LDQgKzUyNyw0IEBAIG1vZHVsZV9leGl0KHBzYl9leGl0KTsKIAogTU9EVUxF X0FVVEhPUihEUklWRVJfQVVUSE9SKTsKIE1PRFVMRV9ERVNDUklQVElPTihEUklWRVJfREVTQyk7 Ci1NT0RVTEVfTElDRU5TRShEUklWRVJfTElDRU5TRSk7CitNT0RVTEVfTElDRU5TRSgiR1BMIik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL3BzYl9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9nbWE1MDAvcHNiX2Rydi5oCmluZGV4IDgyMTQ5N2RiZDNmYy4uNDkxOGVmYzU3Yjdh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL3BzYl9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vZ21hNTAwL3BzYl9kcnYuaApAQCAtMzYsNyArMzYsNiBAQAogI2luY2x1ZGUg Im1tdS5oIgogCiAjZGVmaW5lIERSSVZFUl9BVVRIT1IgIkFsYW4gQ294IDxhbGFuQGxpbnV4Lmlu dGVsLmNvbT4gYW5kIG90aGVycyIKLSNkZWZpbmUgRFJJVkVSX0xJQ0VOU0UgIkdQTCIKIAogI2Rl ZmluZSBEUklWRVJfTkFNRSAiZ21hNTAwIgogI2RlZmluZSBEUklWRVJfREVTQyAiRFJNIGRyaXZl ciBmb3IgdGhlIEludGVsIEdNQTUwMCwgR01BNjAwLCBHTUEzNjAwLCBHTUEzNjUwIgotLSAKMi4x NS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934976AbdKQOQl (ORCPT ); Fri, 17 Nov 2017 09:16:41 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34568 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933932AbdKQOQ2 (ORCPT ); Fri, 17 Nov 2017 09:16:28 -0500 Date: Fri, 17 Nov 2017 15:16:32 +0100 From: Greg Kroah-Hartman To: Patrik Jakobsson , David Airlie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Philippe Ombredanne Subject: [PATCH] gpu: gma500: remove unneeded DRIVER_LICENSE #define Message-ID: <20171117141632.GA17880@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to #define the license of the driver, just put it in the MODULE_LICENSE() line directly as a text string. This allows tools that check that the module license matches the source code license to work properly, as there is no need to unwind the unneeded dereference, especially when the string is defined in a .h file far away from the .c file it is used in. Cc: Patrik Jakobsson Cc: David Airlie Reported-by: Philippe Ombredanne Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 37a3be71acd9..8f5cc1f471cd 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -527,4 +527,4 @@ module_exit(psb_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_LICENSE(DRIVER_LICENSE); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 821497dbd3fc..4918efc57b7a 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -36,7 +36,6 @@ #include "mmu.h" #define DRIVER_AUTHOR "Alan Cox and others" -#define DRIVER_LICENSE "GPL" #define DRIVER_NAME "gma500" #define DRIVER_DESC "DRM driver for the Intel GMA500, GMA600, GMA3600, GMA3650" -- 2.15.0