diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2015-07-17 17:07:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 03:42:54 -0400 |
commit | fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 (patch) | |
tree | 5521435fc6c90d906ba99ee0182c422915e2c17a | |
parent | ca1fec58bc6a90be96a59b4769e951156846c6ca (diff) |
x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn()
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>
Acked-by: Doug Ledford <dledford@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: andy@silverblocksystems.net
Cc: benh@kernel.crashing.org
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: jkosina@suse.cz
Cc: julia.lawall@lip6.fr
Cc: luto@amacapital.net
Cc: mchehab@osg.samsung.com
Link: http://lkml.kernel.org/r/1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 6 |
1 files 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 @@ | |||
31 | * SOFTWARE. | 31 | * SOFTWARE. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
35 | |||
34 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
35 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
36 | #include <linux/idr.h> | 38 | #include <linux/idr.h> |
@@ -399,8 +401,8 @@ static int ipath_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
399 | u32 bar0 = 0, bar1 = 0; | 401 | u32 bar0 = 0, bar1 = 0; |
400 | 402 | ||
401 | #ifdef CONFIG_X86_64 | 403 | #ifdef CONFIG_X86_64 |
402 | if (WARN(pat_enabled(), | 404 | if (pat_enabled()) { |
403 | "ipath needs PAT disabled, boot with nopat kernel parameter\n")) { | 405 | pr_warn("ipath needs PAT disabled, boot with nopat kernel parameter\n"); |
404 | ret = -ENODEV; | 406 | ret = -ENODEV; |
405 | goto bail; | 407 | goto bail; |
406 | } | 408 | } |