From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: mingo@elte.hu
Cc: bp@suse.de, andy@silverblocksystems.net, mchehab@osg.samsung.com,
dledford@redhat.com, dan.j.williams@intel.com,
benh@kernel.crashing.org, luto@amacapital.net,
julia.lawall@lip6.fr, jkosina@suse.cz,
linux-media@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [RESEND PATCH v2 1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn()
Date: Fri, 17 Jul 2015 14:07:24 -0700 [thread overview]
Message-ID: <1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1437167245-28273-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
WARN() may confuse users, fix that. ipath_init_one() is part the
device's probe so this would only be triggered if a corresponding
device was found.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
drivers/infiniband/hw/ipath/ipath_driver.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 2d7e503d13cb..871dbe56216a 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -31,6 +31,8 @@
* SOFTWARE.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/idr.h>
@@ -399,8 +401,8 @@ static int ipath_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
u32 bar0 = 0, bar1 = 0;
#ifdef CONFIG_X86_64
- if (WARN(pat_enabled(),
- "ipath needs PAT disabled, boot with nopat kernel parameter\n")) {
+ if (pat_enabled()) {
+ pr_warn("ipath needs PAT disabled, boot with nopat kernel parameter\n");
ret = -ENODEV;
goto bail;
}
--
2.3.2.209.gd67f9d5.dirty
next prev parent reply other threads:[~2015-07-17 21:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 21:07 [RESEND PATCH v2 0/2] x86/mm/pat: modify nopat requirement warning Luis R. Rodriguez
2015-07-17 21:07 ` Luis R. Rodriguez [this message]
2015-07-20 18:08 ` [RESEND PATCH v2 1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn() Doug Ledford
2015-07-21 9:39 ` [tip:x86/urgent] x86/mm/pat, drivers/infiniband/ipath: Replace " tip-bot for Luis R. Rodriguez
2015-07-17 21:07 ` [RESEND PATCH v2 2/2] x86/mm/pat, drivers/media/ivtv: move pat warn and replace " Luis R. Rodriguez
2015-07-21 9:40 ` [tip:x86/urgent] x86/mm/pat, drivers/media/ivtv: Move the PAT warning " tip-bot for Luis R. Rodriguez
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=1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=andy@silverblocksystems.net \
--cc=benh@kernel.crashing.org \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=dledford@redhat.com \
--cc=jkosina@suse.cz \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcgrof@suse.com \
--cc=mchehab@osg.samsung.com \
--cc=mingo@elte.hu \
/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).