From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 08 Jan 2016 11:00:45 +0000 Subject: [patch] drm: move MODULE_PARM_DESC to other file Message-Id: <20160108110045.GF32195@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie , Daniel Vetter Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org We moved the module options from drm_drv.c to drm_irq.c in 18882995713d ('drm: Move vblank related module options into drm_irq.c'). Let's move the MODULE_PARM_DESC()s as well so they're together. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index bf934cde..167c8d3 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -44,10 +44,6 @@ MODULE_AUTHOR(CORE_AUTHOR); MODULE_DESCRIPTION(CORE_DESC); MODULE_LICENSE("GPL and additional rights"); MODULE_PARM_DESC(debug, "Enable debug output"); -MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)"); -MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); -MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); - module_param_named(debug, drm_debug, int, 0600); static DEFINE_SPINLOCK(drm_minor_lock); diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 607f493..d12a4ef 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -73,6 +73,9 @@ static int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600); +MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)"); +MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); +MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); static void store_vblank(struct drm_device *dev, unsigned int pipe, u32 vblank_count_inc, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm: move MODULE_PARM_DESC to other file Date: Fri, 8 Jan 2016 14:00:45 +0300 Message-ID: <20160108110045.GF32195@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA6706E762 for ; Fri, 8 Jan 2016 03:01:06 -0800 (PST) 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: David Airlie , Daniel Vetter Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2UgbW92ZWQgdGhlIG1vZHVsZSBvcHRpb25zIGZyb20gZHJtX2Rydi5jIHRvIGRybV9pcnEuYyBp biAxODg4Mjk5NTcxM2QKKCdkcm06IE1vdmUgdmJsYW5rIHJlbGF0ZWQgbW9kdWxlIG9wdGlvbnMg aW50byBkcm1faXJxLmMnKS4gIExldCdzIG1vdmUKdGhlIE1PRFVMRV9QQVJNX0RFU0MoKXMgYXMg d2VsbCBzbyB0aGV5J3JlIHRvZ2V0aGVyLgoKU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8 ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCmluZGV4IGJmOTM0Y2RlLi4xNjdj OGQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fZHJ2LmMKQEAgLTQ0LDEwICs0NCw2IEBAIE1PRFVMRV9BVVRIT1IoQ09SRV9B VVRIT1IpOwogTU9EVUxFX0RFU0NSSVBUSU9OKENPUkVfREVTQyk7CiBNT0RVTEVfTElDRU5TRSgi R1BMIGFuZCBhZGRpdGlvbmFsIHJpZ2h0cyIpOwogTU9EVUxFX1BBUk1fREVTQyhkZWJ1ZywgIkVu YWJsZSBkZWJ1ZyBvdXRwdXQiKTsKLU1PRFVMRV9QQVJNX0RFU0ModmJsYW5rb2ZmZGVsYXksICJE ZWxheSB1bnRpbCB2YmxhbmsgaXJxIGF1dG8tZGlzYWJsZSBbbXNlY3NdICgwOiBuZXZlciBkaXNh YmxlLCA8MDogZGlzYWJsZSBpbW1lZGlhdGVseSkiKTsKLU1PRFVMRV9QQVJNX0RFU0ModGltZXN0 YW1wX3ByZWNpc2lvbl91c2VjLCAiTWF4LiBlcnJvciBvbiB0aW1lc3RhbXBzIFt1c2Vjc10iKTsK LU1PRFVMRV9QQVJNX0RFU0ModGltZXN0YW1wX21vbm90b25pYywgIlVzZSBtb25vdG9uaWMgdGlt ZXN0YW1wcyIpOwotCiBtb2R1bGVfcGFyYW1fbmFtZWQoZGVidWcsIGRybV9kZWJ1ZywgaW50LCAw NjAwKTsKIAogc3RhdGljIERFRklORV9TUElOTE9DSyhkcm1fbWlub3JfbG9jayk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pcnEu YwppbmRleCA2MDdmNDkzLi5kMTJhNGVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1faXJxLmMKQEAgLTczLDYgKzczLDkgQEAg c3RhdGljIGludCBkcm1fdmJsYW5rX29mZmRlbGF5ID0gNTAwMDsgICAgLyogRGVmYXVsdCB0byA1 MDAwIG1zZWNzLiAqLwogbW9kdWxlX3BhcmFtX25hbWVkKHZibGFua29mZmRlbGF5LCBkcm1fdmJs YW5rX29mZmRlbGF5LCBpbnQsIDA2MDApOwogbW9kdWxlX3BhcmFtX25hbWVkKHRpbWVzdGFtcF9w cmVjaXNpb25fdXNlYywgZHJtX3RpbWVzdGFtcF9wcmVjaXNpb24sIGludCwgMDYwMCk7CiBtb2R1 bGVfcGFyYW1fbmFtZWQodGltZXN0YW1wX21vbm90b25pYywgZHJtX3RpbWVzdGFtcF9tb25vdG9u aWMsIGludCwgMDYwMCk7CitNT0RVTEVfUEFSTV9ERVNDKHZibGFua29mZmRlbGF5LCAiRGVsYXkg dW50aWwgdmJsYW5rIGlycSBhdXRvLWRpc2FibGUgW21zZWNzXSAoMDogbmV2ZXIgZGlzYWJsZSwg PDA6IGRpc2FibGUgaW1tZWRpYXRlbHkpIik7CitNT0RVTEVfUEFSTV9ERVNDKHRpbWVzdGFtcF9w cmVjaXNpb25fdXNlYywgIk1heC4gZXJyb3Igb24gdGltZXN0YW1wcyBbdXNlY3NdIik7CitNT0RV TEVfUEFSTV9ERVNDKHRpbWVzdGFtcF9tb25vdG9uaWMsICJVc2UgbW9ub3RvbmljIHRpbWVzdGFt cHMiKTsKIAogc3RhdGljIHZvaWQgc3RvcmVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVuc2lnbmVkIGludCBwaXBlLAogCQkJIHUzMiB2YmxhbmtfY291bnRfaW5jLApfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754681AbcAHLBJ (ORCPT ); Fri, 8 Jan 2016 06:01:09 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:26241 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753654AbcAHLBH (ORCPT ); Fri, 8 Jan 2016 06:01:07 -0500 Date: Fri, 8 Jan 2016 14:00:45 +0300 From: Dan Carpenter To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] drm: move MODULE_PARM_DESC to other file Message-ID: <20160108110045.GF32195@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We moved the module options from drm_drv.c to drm_irq.c in 18882995713d ('drm: Move vblank related module options into drm_irq.c'). Let's move the MODULE_PARM_DESC()s as well so they're together. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index bf934cde..167c8d3 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -44,10 +44,6 @@ MODULE_AUTHOR(CORE_AUTHOR); MODULE_DESCRIPTION(CORE_DESC); MODULE_LICENSE("GPL and additional rights"); MODULE_PARM_DESC(debug, "Enable debug output"); -MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)"); -MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); -MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); - module_param_named(debug, drm_debug, int, 0600); static DEFINE_SPINLOCK(drm_minor_lock); diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 607f493..d12a4ef 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -73,6 +73,9 @@ static int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600); +MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)"); +MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); +MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); static void store_vblank(struct drm_device *dev, unsigned int pipe, u32 vblank_count_inc,