From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.4 025/105] drm: extra printk() wrapper macros Date: Fri, 15 Dec 2017 10:44:23 +0100 Message-ID: <20171215092307.181537002@linuxfoundation.org> References: <20171215092305.994559179@linuxfoundation.org> 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 7B6926E7B7 for ; Fri, 15 Dec 2017 09:46:40 +0000 (UTC) In-Reply-To: <20171215092305.994559179@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: Dave Gordon , Arnd Bergmann , Tvrtko Ursulin , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Dave Airlie List-Id: dri-devel@lists.freedesktop.org NC40LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IERhdmUgR29yZG9u IDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Cgpjb21taXQgMzBiMGRhOGQ1NTZlNjVmZjkzNWE1 NmNkODJjMDViYTA1MTZkM2U0YSB1cHN0cmVhbS4KCldlIGhhZCBvbmx5IERSTV9JTkZPKCkgYW5k IERSTV9FUlJPUigpLCB3aGVyZWFzIHRoZSB1bmRlcmx5aW5nIHByaW50aygpCnByb3ZpZGVzIHNl dmVyYWwgb3RoZXIgdXNlZnVsIGludGVybWVkaWF0ZSBsZXZlbHMgc3VjaCBhcyBOT1RJQ0UgYW5k CldBUk5JTkcuIFNvIHRoaXMgcGF0Y2ggZmlsbHMgb3V0IHRoZSBzZXQgYnkgcHJvdmlkaW5nIGJv dGggcmVndWxhciBhbmQKb25jZS1vbmx5IG1hY3JvcyBmb3IgZWFjaCBvZiB0aGUgbGV2ZWxzIElO Rk8sIE5PVElDRSwgYW5kIFdBUk5JTkcsIHVzaW5nCmEgY29tbW9uIHVuZGVybHlpbmcgbWFjcm8g dGhhdCBkb2VzIGFsbCB0aGUgdG9rZW4tcGFzdGluZy4KCkRSTV9FUlJPUiBpcyB1bmNoYW5nZWQs IGFzIGl0J3Mgbm90IGp1c3QgYSBwcmludGsgd3JhcHBlci4KCnYyOgogICAgRml4IHdoaXRlc3Bh Y2UsIG1pc3NpbmcgIyMgKEVyaWMgRW5nZXN0cm9tKQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEVyaWMgRW5nZXN0cm9t IDxlcmljLmVuZ2VzdHJvbUBpbWd0ZWMuY29tPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpBY2tlZC1ieTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KU2lnbmVk LW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IEFy bmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFy dG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CgotLS0KIGluY2x1ZGUvZHJtL2RybVAu aCB8ICAgMjYgKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBp bnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKLS0tIGEvaW5jbHVkZS9kcm0vZHJtUC5oCisr KyBiL2luY2x1ZGUvZHJtL2RybVAuaApAQCAtMTU4LDYgKzE1OCwyNiBAQCB2b2lkIGRybV9lcnIo Y29uc3QgY2hhciAqZm9ybWF0LCAuLi4pOwogLyoqIFxuYW1lIE1hY3JvcyB0byBtYWtlIHByaW50 ayBlYXNpZXIgKi8KIC8qQHsqLwogCisjZGVmaW5lIF9EUk1fUFJJTlRLKG9uY2UsIGxldmVsLCBm bXQsIC4uLikJCQkJXAorCWRvIHsJCQkJCQkJCVwKKwkJcHJpbnRrIyNvbmNlKEtFUk5fIyNsZXZl bCAiWyIgRFJNX05BTUUgIl0gIiBmbXQsCVwKKwkJCSAgICAgIyNfX1ZBX0FSR1NfXyk7CQkJCVwK Kwl9IHdoaWxlICgwKQorCisjZGVmaW5lIERSTV9JTkZPKGZtdCwgLi4uKQkJCQkJCVwKKwlfRFJN X1BSSU5USygsIElORk8sIGZtdCwgIyNfX1ZBX0FSR1NfXykKKyNkZWZpbmUgRFJNX05PVEUoZm10 LCAuLi4pCQkJCQkJXAorCV9EUk1fUFJJTlRLKCwgTk9USUNFLCBmbXQsICMjX19WQV9BUkdTX18p CisjZGVmaW5lIERSTV9XQVJOKGZtdCwgLi4uKQkJCQkJCVwKKwlfRFJNX1BSSU5USygsIFdBUk5J TkcsIGZtdCwgIyNfX1ZBX0FSR1NfXykKKworI2RlZmluZSBEUk1fSU5GT19PTkNFKGZtdCwgLi4u KQkJCQkJCVwKKwlfRFJNX1BSSU5USyhfb25jZSwgSU5GTywgZm10LCAjI19fVkFfQVJHU19fKQor I2RlZmluZSBEUk1fTk9URV9PTkNFKGZtdCwgLi4uKQkJCQkJCVwKKwlfRFJNX1BSSU5USyhfb25j ZSwgTk9USUNFLCBmbXQsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIERSTV9XQVJOX09OQ0UoZm10 LCAuLi4pCQkJCQkJXAorCV9EUk1fUFJJTlRLKF9vbmNlLCBXQVJOSU5HLCBmbXQsICMjX19WQV9B UkdTX18pCisKIC8qKgogICogRXJyb3Igb3V0cHV0LgogICoKQEAgLTE4MywxMiArMjAzLDYgQEAg dm9pZCBkcm1fZXJyKGNvbnN0IGNoYXIgKmZvcm1hdCwgLi4uKTsKIAkJZHJtX2VycihmbXQsICMj X19WQV9BUkdTX18pOwkJCQlcCiB9KQogCi0jZGVmaW5lIERSTV9JTkZPKGZtdCwgLi4uKQkJCQlc Ci0JcHJpbnRrKEtFUk5fSU5GTyAiWyIgRFJNX05BTUUgIl0gIiBmbXQsICMjX19WQV9BUkdTX18p Ci0KLSNkZWZpbmUgRFJNX0lORk9fT05DRShmbXQsIC4uLikJCQkJXAotCXByaW50a19vbmNlKEtF Uk5fSU5GTyAiWyIgRFJNX05BTUUgIl0gIiBmbXQsICMjX19WQV9BUkdTX18pCi0KIC8qKgogICog RGVidWcgb3V0cHV0LgogICoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755758AbdLOKoA (ORCPT ); Fri, 15 Dec 2017 05:44:00 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:33860 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754859AbdLOJql (ORCPT ); Fri, 15 Dec 2017 04:46:41 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Gordon , Eric Engestrom , dri-devel@lists.freedesktop.org, Dave Airlie , Tvrtko Ursulin , Arnd Bergmann Subject: [PATCH 4.4 025/105] drm: extra printk() wrapper macros Date: Fri, 15 Dec 2017 10:44:23 +0100 Message-Id: <20171215092307.181537002@linuxfoundation.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215092305.994559179@linuxfoundation.org> References: <20171215092305.994559179@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Gordon commit 30b0da8d556e65ff935a56cd82c05ba0516d3e4a upstream. We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon Reviewed-by: Eric Engestrom Cc: dri-devel@lists.freedesktop.org Acked-by: Dave Airlie Signed-off-by: Tvrtko Ursulin Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -158,6 +158,26 @@ void drm_err(const char *format, ...); /** \name Macros to make printk easier */ /*@{*/ +#define _DRM_PRINTK(once, level, fmt, ...) \ + do { \ + printk##once(KERN_##level "[" DRM_NAME "] " fmt, \ + ##__VA_ARGS__); \ + } while (0) + +#define DRM_INFO(fmt, ...) \ + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE(fmt, ...) \ + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN(fmt, ...) \ + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) + +#define DRM_INFO_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN_ONCE(fmt, ...) \ + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) + /** * Error output. * @@ -183,12 +203,6 @@ void drm_err(const char *format, ...); drm_err(fmt, ##__VA_ARGS__); \ }) -#define DRM_INFO(fmt, ...) \ - printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - -#define DRM_INFO_ONCE(fmt, ...) \ - printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - /** * Debug output. *