From patchwork Wed Jun 24 17:23:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6669621 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4914C05AC for ; Wed, 24 Jun 2015 17:27:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07A1C205AA for ; Wed, 24 Jun 2015 17:27:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31F4220595 for ; Wed, 24 Jun 2015 17:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753402AbbFXR1p (ORCPT ); Wed, 24 Jun 2015 13:27:45 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:33167 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbbFXR1o (ORCPT ); Wed, 24 Jun 2015 13:27:44 -0400 Received: by pdjn11 with SMTP id n11so34858877pdj.0; Wed, 24 Jun 2015 10:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FlEvwRXWvEK8FnA6GhBakccvnj3fJg7PpmWOE11WghE=; b=YdP7O5XJNyvysz6B3KC4nKh7EPvl6n98XO1/pnHGUSjCxNvlOCNsEAtKXimRknAh5R 3/cwZ6D0aCPiVCkC7AomZP801FANakBzvfgpoObRAy391zxewGEt8NJ4crGD/6T6oSMn 3T1F9KKOeBMeUY+CWUx4HvN68dsBmwkjptWxsQ9TnCovXUG4AHa0o1qoeqWMtPuCk4l0 St/69yX6dG7namwlLHUx4k81Ug1v/y3JT3RPjFhF1c8WozEURd0I+DMjNLogYA3MuGVb U8fyqf1OIcxQDC6/UovItvqXI/z6+KF4ppJApP+a1e009f97X0yQ7ExHaIJcHTdfu8Cy ziwg== X-Received: by 10.67.8.71 with SMTP id di7mr82974495pad.46.1435166863986; Wed, 24 Jun 2015 10:27:43 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id j9sm27324010pbq.92.2015.06.24.10.27.41 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 24 Jun 2015 10:27:42 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 24 Jun 2015 10:25:33 -0700 From: "Luis R. Rodriguez" To: bp@suse.de, andy@silverblocksystems.net, mchehab@osg.samsung.com, dledford@redhat.com Cc: mingo@kernel.org, fengguang.wu@intel.com, linux-media@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH v2 1/2] x86/mm/pat, drivers/infiniband/ipath: replace WARN() with pr_warn() Date: Wed, 24 Jun 2015 10:23:19 -0700 Message-Id: <1435166600-11956-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435166600-11956-1-git-send-email-mcgrof@do-not-panic.com> References: <1435166600-11956-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" 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 --- 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 2d7e503..871dbe5 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 #include #include @@ -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; }