From patchwork Thu Nov 15 10:20:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 151217 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6808615ljp; Thu, 15 Nov 2018 02:19:21 -0800 (PST) X-Google-Smtp-Source: AJdET5cO1vX7Ey9TSZK3+bLZJg4srplIUdlfF4Whsy5rGugv0/R6y3pPbQD6TavyNQWRbImj2Br/ X-Received: by 2002:a62:ab0d:: with SMTP id p13mr5270073pff.211.1542277161394; Thu, 15 Nov 2018 02:19:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542277161; cv=none; d=google.com; s=arc-20160816; b=LyWhuhUTKsQsux+6r/QEJpzyLL5G0YvaCeAj1DnhURwH4ujE6YL3wi7yTazFlMC1YB m70Znx2AToXMCvqNDGD+aP3gG9bA5+JpilkuTrMQBhMm3FTTVXObQzAj4IVcM37MqfxH 5KGDLM3r+lXj3C4syjl6A4ccIbvUEEyCeRf15FqqIRYAitp3gJqeN33PJhZjb19uFNXK bOZ4r4TkBYwxXBQofsq3RY+2Kk3lLQYZHI8G2sgGk8RetEqmMKZlEPx3YtMaWnokTOTM BrbxZNjE4C2WhUwVA3QnjEws4UqPO9IXqxcTWSViE8KWa2ZxRDMe42HLYBPjKn7aUPud Ro/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=drKY8ZSAnNxDSqIYoua89vrf1euy4aJliZqszhcbO5Q=; b=oGZYEBUvEwTB1C5Jvcsr0tIoRdzsVLzVwkr6d4tSJq8Mv7ITkd6ubUtrOpyzaJIK+O /dWbe0UZajc/BkMzkHvTKz6f/GXk5Gp2fP7BmpvIt8GQrRbp7BMQw3mXAOCj80tK2irT uxfqXLWRGjgx9CEWpnUq243vtZaYEDRJCztjQvP4xiDKbslGmWphN4IBrYoRkyEm/nUO nMiB6HVyhUSfPB3rHvrNlxS2rhrsYCPQrF2XRuGACxTVsVi9MvR8ITzIUTuAmuBUR/ZX 5sf2euNgrrglOVijhxKCKB6g84nE2QvkaYOPPH089QKLs0j+FaZFbtL+sq7IsO29kd3o fooA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a59-v6si29688898pla.60.2018.11.15.02.19.21; Thu, 15 Nov 2018 02:19:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387924AbeKOU0d (ORCPT + 1 other); Thu, 15 Nov 2018 15:26:33 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:14667 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731710AbeKOU0d (ORCPT ); Thu, 15 Nov 2018 15:26:33 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 5825C802852CA; Thu, 15 Nov 2018 18:19:14 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.408.0; Thu, 15 Nov 2018 18:19:08 +0800 From: John Garry To: , CC: , , , , , , John Garry Subject: [PATCH v2 3/5] scsi: libsas: Drop sas_printk() Date: Thu, 15 Nov 2018 18:20:30 +0800 Message-ID: <1542277232-135789-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1542277232-135789-1-git-send-email-john.garry@huawei.com> References: <1542277232-135789-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The printk wrapper sas_printk() adds little value now that libsas logs already have the "sas" prefix through pr_fmt(fmt), so just use pr_notice() directly. In addition, strings which span multiple lines are reunited. Originally-from: Joe Perches Signed-off-by: John Garry --- drivers/scsi/libsas/sas_expander.c | 22 ++++++++++------------ drivers/scsi/libsas/sas_init.c | 4 ++-- drivers/scsi/libsas/sas_internal.h | 2 -- drivers/scsi/libsas/sas_phy.c | 8 ++++---- 4 files changed, 16 insertions(+), 20 deletions(-) -- 1.9.1 diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 0d1f727..579304d 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -393,7 +393,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req, return res; dr = &((struct smp_resp *)disc_resp)->disc; if (memcmp(dev->sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE) == 0) { - sas_printk("Found loopback topology, just ignore it!\n"); + pr_notice("Found loopback topology, just ignore it!\n"); return 0; } sas_set_ex_phy(dev, single, disc_resp); @@ -1262,19 +1262,17 @@ static void sas_print_parent_topology_bug(struct domain_device *child, }; struct domain_device *parent = child->parent; - sas_printk("%s ex %016llx phy 0x%x <--> %s ex %016llx " - "phy 0x%x has %c:%c routing link!\n", + pr_notice("%s ex %016llx phy 0x%x <--> %s ex %016llx phy 0x%x has %c:%c routing link!\n", + ex_type[parent->dev_type], + SAS_ADDR(parent->sas_addr), + parent_phy->phy_id, - ex_type[parent->dev_type], - SAS_ADDR(parent->sas_addr), - parent_phy->phy_id, + ex_type[child->dev_type], + SAS_ADDR(child->sas_addr), + child_phy->phy_id, - ex_type[child->dev_type], - SAS_ADDR(child->sas_addr), - child_phy->phy_id, - - sas_route_char(parent, parent_phy), - sas_route_char(child, child_phy)); + sas_route_char(parent, parent_phy), + sas_route_char(child, child_phy)); } static int sas_check_eeds(struct domain_device *child, diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index ede0af7..a3c25e2 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -623,8 +623,8 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy) if (atomic_read(&phy->event_nr) > phy->ha->event_thres) { if (i->dft->lldd_control_phy) { if (cmpxchg(&phy->in_shutdown, 0, 1) == 0) { - sas_printk("The phy%02d bursting events, shut it down.\n", - phy->id); + pr_notice("The phy%02d bursting events, shut it down.\n", + phy->id); sas_notify_phy_event(phy, PHYE_SHUTDOWN); } } else { diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 94ebf41..910aa31 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -40,8 +40,6 @@ #define pr_fmt(fmt) SAS_FMT fmt -#define sas_printk(fmt, ...) printk(KERN_NOTICE fmt, ## __VA_ARGS__) - #define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG fmt, ## __VA_ARGS__) diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c index bf3e1b9..0374243 100644 --- a/drivers/scsi/libsas/sas_phy.c +++ b/drivers/scsi/libsas/sas_phy.c @@ -122,11 +122,11 @@ static void sas_phye_shutdown(struct work_struct *work) phy->enabled = 0; ret = i->dft->lldd_control_phy(phy, PHY_FUNC_DISABLE, NULL); if (ret) - sas_printk("lldd disable phy%02d returned %d\n", - phy->id, ret); + pr_notice("lldd disable phy%02d returned %d\n", + phy->id, ret); } else - sas_printk("phy%02d is not enabled, cannot shutdown\n", - phy->id); + pr_notice("phy%02d is not enabled, cannot shutdown\n", + phy->id); } /* ---------- Phy class registration ---------- */