From: Joe Perches <joe@perches.com>
To: Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] gpu: drm: core: Convert printk(KERN_<LEVEL> to pr_<level>
Date: Tue, 28 Feb 2017 04:55:53 -0800 [thread overview]
Message-ID: <e68d85ae340ac09724d0998dc499988dba9b29dd.1488285953.git.joe@perches.com> (raw)
In-Reply-To: <20170228090409.722xmltrx4g6i3tz@phenom.ffwll.local>
In-Reply-To: <cover.1488285953.git.joe@perches.com>
Use a more common logging style.
Miscellanea:
o Coalesce formats and realign arguments
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/gpu/drm/drm_cache.c | 12 ++++++------
drivers/gpu/drm/drm_edid.c | 4 ++--
drivers/gpu/drm/drm_ioc32.c | 3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index c3b9aaccdf42..3bd76e918b5d 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -88,7 +88,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
}
if (wbinvd_on_all_cpus())
- printk(KERN_ERR "Timed out waiting for cache flush.\n");
+ pr_err("Timed out waiting for cache flush\n");
#elif defined(__powerpc__)
unsigned long i;
@@ -105,7 +105,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
kunmap_atomic(page_virtual);
}
#else
- printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+ pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1);
#endif
}
@@ -134,9 +134,9 @@ drm_clflush_sg(struct sg_table *st)
}
if (wbinvd_on_all_cpus())
- printk(KERN_ERR "Timed out waiting for cache flush.\n");
+ pr_err("Timed out waiting for cache flush\n");
#else
- printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+ pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1);
#endif
}
@@ -167,9 +167,9 @@ drm_clflush_virt_range(void *addr, unsigned long length)
}
if (wbinvd_on_all_cpus())
- printk(KERN_ERR "Timed out waiting for cache flush.\n");
+ pr_err("Timed out waiting for cache flush\n");
#else
- printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+ pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1);
#endif
}
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c8baab9bee0d..ca4f054f71b2 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1164,9 +1164,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
bad:
if (print_bad_edid) {
if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) {
- printk(KERN_ERR "EDID block is all zeroes\n");
+ pr_err("EDID block is all zeroes\n");
} else {
- printk(KERN_ERR "Raw EDID:\n");
+ pr_err("Raw EDID:\n");
print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1,
raw_edid, EDID_LENGTH, false);
}
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 867ab8c1582b..b134482f4022 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -257,8 +257,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd,
m32.handle = (unsigned long)handle;
if (m32.handle != (unsigned long)handle)
- printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle"
- " %p for type %d offset %x\n",
+ pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n",
handle, m32.type, m32.offset);
if (copy_to_user(argp, &m32, sizeof(m32)))
--
2.10.0.rc2.1.g053435c
next prev parent reply other threads:[~2017-02-28 12:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 1:31 [PATCH 0/2] gpu: drm: Use pr_cont and neaten logging Joe Perches
2017-02-28 1:31 ` [PATCH 1/2] drm: Use pr_cont where appropriate Joe Perches
2017-03-01 23:06 ` Alex Deucher
2017-02-28 1:31 ` [PATCH 2/2] gpu: drm: Convert printk(KERN_<LEVEL> to pr_<level> Joe Perches
2017-02-28 9:04 ` Daniel Vetter
2017-02-28 12:55 ` [PATCH 0/3] gpu: drm: Convert printk(KERN_<level> " Joe Perches
2017-02-28 12:55 ` [PATCH 1/3] gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> " Joe Perches
2017-03-01 23:19 ` Alex Deucher
2017-02-28 12:55 ` Joe Perches [this message]
2017-02-28 12:55 ` [PATCH 3/3] gpu: drm: drivers: " Joe Perches
2017-02-28 18:26 ` Rob Clark
2017-02-28 19:49 ` Sinclair Yeh
2017-02-28 20:25 ` Patrik Jakobsson
2017-03-01 7:18 ` Tomi Valkeinen
2017-03-01 8:44 ` [Nouveau] " Daniel Vetter
2017-02-28 13:33 ` [Nouveau] [PATCH 0/3] gpu: drm: Convert printk(KERN_<level> " Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e68d85ae340ac09724d0998dc499988dba9b29dd.1488285953.git.joe@perches.com \
--to=joe@perches.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).