From patchwork Fri Jul 17 21:07:24 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: 6819331 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B06A99F6CE for ; Fri, 17 Jul 2015 21:10:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9D12207D8 for ; Fri, 17 Jul 2015 21:10:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 200E2207E7 for ; Fri, 17 Jul 2015 21:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754072AbbGQVHj (ORCPT ); Fri, 17 Jul 2015 17:07:39 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34732 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754340AbbGQVHh (ORCPT ); Fri, 17 Jul 2015 17:07:37 -0400 Received: by pacan13 with SMTP id an13so66878622pac.1; Fri, 17 Jul 2015 14:07:37 -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=Y+BXs6eH6anapGjxGNwRgyRMTlKMdjUfPNdwxPwhT7A=; b=ihcPpeFjGOTfX55nuji71du6nBMte7fnhpiL8Szmq5yjCQsYjpyD63lBEhbbKZICYU WvyMUgYyk/87iNL1tYBuJYAFr3uAi/MWraOXdRjrvTG4Ze+tW3/Mho5TTlvuj+qtRqUX 8U5T3kAi+1nosqYIHqrM2GCBOJy+HGYX46HUeSs+ShiTNZAk0BLQy4PBpkWtGgFiAfLu vpoR4ZvRU6pSyEZDJNVnCHYc6Q0Ij8MU+Wtpmo4IbwWb9oDPmnHUngf7pmLkWd4bxYAV Zep2Apo9trCwrfgp9ccpIc4OFteL22mtvmR3vSUm2cNh0n8D7CPfS8GMjRHvDWh1qwEr jZBw== X-Received: by 10.66.151.133 with SMTP id uq5mr33151043pab.7.1437167257138; Fri, 17 Jul 2015 14:07:37 -0700 (PDT) Received: from mcgrof@gmail.com ([2601:646:200:bc5b:ca60:ff:feda:57a7]) by smtp.gmail.com with ESMTPSA id kh6sm12205787pbc.50.2015.07.17.14.07.34 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 17 Jul 2015 14:07:36 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Fri, 17 Jul 2015 14:07:33 -0700 From: "Luis R. Rodriguez" 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" 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 Message-Id: <1437167245-28273-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437167245-28273-1-git-send-email-mcgrof@do-not-panic.com> References: <1437167245-28273-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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Acked-by: Doug Ledford --- 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 #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; }