diff mbox

[RESEND,v2,1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn()

Message ID 1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Luis R. Rodriguez July 17, 2015, 9:07 p.m. UTC 
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(-)

Comments

Doug Ledford July 20, 2015, 6:08 p.m. UTC | #1 
> On Jul 17, 2015, at 5:07 PM, Luis R. Rodriguez <mcgrof@do-not-panic.com> wrote:
> 
> 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>

Acked-by: Doug Ledford <dledford@redhat.com>

—
Doug Ledford <dledford@redhat.com>
	GPG Key ID: 0E572FDD
diff mbox

Patch

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;
 	}