From patchwork Wed Nov 14 13:47:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 151088 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5709107ljp; Wed, 14 Nov 2018 05:47:45 -0800 (PST) X-Google-Smtp-Source: AJdET5fN4SmDPnaMQ/pvhm1sCj6cgnlS0OQn/utsHlopndVtZWkQcy/6LAMIXob5XEkt2IVHjYUv X-Received: by 2002:a63:170c:: with SMTP id x12mr1766956pgl.364.1542203265852; Wed, 14 Nov 2018 05:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542203265; cv=none; d=google.com; s=arc-20160816; b=ysXNlaIWCNdzoDbzmbskps34h9eCLhx3CcAcaoz6PcSswayGX09owts2Yi0G4PluP0 tiUT9CYz+WhiESMa4ur4QPbiYrFu5PEYLrOzwpnK44T2u1sIgKUTdl4jGzZS5W7bJcnA Nh+5Srmo1bx9IwhRvuDizEI35bwUmPHXAjwhOyj+1krCGecZ8Atb9PT3LQjoRh36+goP QO3lsGbNOlV5LmVx7aJ4jHCr87yF95EfsOuUqKKHR2rAhykkk1OaT8ez3Pbo6S+eEiMb sucFF3eqxrjC9V0CyZFIWEuXfx6aLGa27SHsJojZOVDJkisTLUCMgZhWD5mqlUoSpEPY I2ww== 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=1+MIniKhSJLOPGVO6AtZIFLCYsnK5SUAb1f1IfWlYak=; b=EoH83Eh2Jg8x9FSc6DKsIqTrgfWvFKXdMSAi7CD2+QSAcTj+aswu9BEVnhiYrGJS+b wXFH4XWBpQR5hl+5zPJ4zTuNz4PLthmLFW08HulSqF3LVz3xkb7BgDV1yGS1KcECma/O CiA8ndx3TaX1XU+Sto8hOikwY/trHL9G3rDYskzpHnkLRPAbn/M/32zUvAwzy5JgiX1J uwzUFxKtvWcquuocn/zTk8p/a0RtVQCvLhNxBJ0GkjY/iPSZNaUPGv4ZlcsEkQqtxaqy Fw4vmiPHjuK0r3nUN2YNvVll6TslDL+mKKyInM2W94EBxP5Euke0J8Z4QeluB+ejtcEf RUtg== 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 i127-v6si26864122pfc.148.2018.11.14.05.47.45; Wed, 14 Nov 2018 05:47:45 -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 S1733039AbeKNXvE (ORCPT + 1 other); Wed, 14 Nov 2018 18:51:04 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:36346 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732604AbeKNXvE (ORCPT ); Wed, 14 Nov 2018 18:51:04 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id C2779C0F1550F; Wed, 14 Nov 2018 21:46:53 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Wed, 14 Nov 2018 21:46:45 +0800 From: John Garry To: , CC: , , , , , , John Garry Subject: [PATCH 1/5] scsi: libsas: Delete sas_dump.{c, h} Date: Wed, 14 Nov 2018 21:47:45 +0800 Message-ID: <1542203269-174932-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1542203269-174932-1-git-send-email-john.garry@huawei.com> References: <1542203269-174932-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 code in these files is not longer referenced, so delete them. Signed-off-by: John Garry --- drivers/scsi/libsas/Makefile | 1 - drivers/scsi/libsas/sas_dump.c | 63 ----------------------------------------- drivers/scsi/libsas/sas_dump.h | 29 ------------------- drivers/scsi/libsas/sas_event.c | 1 - 4 files changed, 94 deletions(-) delete mode 100644 drivers/scsi/libsas/sas_dump.c delete mode 100644 drivers/scsi/libsas/sas_dump.h -- 1.9.1 diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile index 2e70140..c1db9027 100644 --- a/drivers/scsi/libsas/Makefile +++ b/drivers/scsi/libsas/Makefile @@ -26,7 +26,6 @@ libsas-y += sas_init.o \ sas_phy.o \ sas_port.o \ sas_event.o \ - sas_dump.o \ sas_discover.o \ sas_expander.o \ sas_scsi_host.o \ diff --git a/drivers/scsi/libsas/sas_dump.c b/drivers/scsi/libsas/sas_dump.c deleted file mode 100644 index 7e5d262..0000000 --- a/drivers/scsi/libsas/sas_dump.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Serial Attached SCSI (SAS) Dump/Debugging routines - * - * Copyright (C) 2005 Adaptec, Inc. All rights reserved. - * Copyright (C) 2005 Luben Tuikov - * - * This file is licensed under GPLv2. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "sas_dump.h" - -static const char *sas_porte_str[] = { - [0] = "PORTE_BYTES_DMAED", - [1] = "PORTE_BROADCAST_RCVD", - [2] = "PORTE_LINK_RESET_ERR", - [3] = "PORTE_TIMER_EVENT", - [4] = "PORTE_HARD_RESET", -}; - -static const char *sas_phye_str[] = { - [0] = "PHYE_LOSS_OF_SIGNAL", - [1] = "PHYE_OOB_DONE", - [2] = "PHYE_OOB_ERROR", - [3] = "PHYE_SPINUP_HOLD", - [4] = "PHYE_RESUME_TIMEOUT", -}; - -void sas_dprint_porte(int phyid, enum port_event pe) -{ - SAS_DPRINTK("phy%d: port event: %s\n", phyid, sas_porte_str[pe]); -} -void sas_dprint_phye(int phyid, enum phy_event pe) -{ - SAS_DPRINTK("phy%d: phy event: %s\n", phyid, sas_phye_str[pe]); -} - -void sas_dump_port(struct asd_sas_port *port) -{ - SAS_DPRINTK("port%d: class:0x%x\n", port->id, port->class); - SAS_DPRINTK("port%d: sas_addr:%llx\n", port->id, - SAS_ADDR(port->sas_addr)); - SAS_DPRINTK("port%d: attached_sas_addr:%llx\n", port->id, - SAS_ADDR(port->attached_sas_addr)); - SAS_DPRINTK("port%d: iproto:0x%x\n", port->id, port->iproto); - SAS_DPRINTK("port%d: tproto:0x%x\n", port->id, port->tproto); - SAS_DPRINTK("port%d: oob_mode:0x%x\n", port->id, port->oob_mode); - SAS_DPRINTK("port%d: num_phys:%d\n", port->id, port->num_phys); -} diff --git a/drivers/scsi/libsas/sas_dump.h b/drivers/scsi/libsas/sas_dump.h deleted file mode 100644 index 6aaee6b..0000000 --- a/drivers/scsi/libsas/sas_dump.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Serial Attached SCSI (SAS) Dump/Debugging routines header file - * - * Copyright (C) 2005 Adaptec, Inc. All rights reserved. - * Copyright (C) 2005 Luben Tuikov - * - * This file is licensed under GPLv2. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "sas_internal.h" - -void sas_dprint_porte(int phyid, enum port_event pe); -void sas_dprint_phye(int phyid, enum phy_event pe); -void sas_dump_port(struct asd_sas_port *port); diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c index ae923eb..b1e0f7d 100644 --- a/drivers/scsi/libsas/sas_event.c +++ b/drivers/scsi/libsas/sas_event.c @@ -25,7 +25,6 @@ #include #include #include "sas_internal.h" -#include "sas_dump.h" int sas_queue_work(struct sas_ha_struct *ha, struct sas_work *sw) { From patchwork Wed Nov 14 13:47:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 151087 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5708896ljp; Wed, 14 Nov 2018 05:47:34 -0800 (PST) X-Google-Smtp-Source: AJdET5dmI4WqR2E4/+n03pOQj6+VOtKEmQmbj6ighRh/J7n6A0SdjBqko7uGdw8v4law31Y90bc7 X-Received: by 2002:a62:fb14:: with SMTP id x20-v6mr2018423pfm.71.1542203254400; Wed, 14 Nov 2018 05:47:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542203254; cv=none; d=google.com; s=arc-20160816; b=HZnQAW+qGKb6MQOvhYfMi2Jcc8MtKkAxluUE4+QhT2OG5yak16iTdDsfkrGvf5h9zs HaZywHWBwSeZsxVbKZBVto3DO/7+L4Xb6upMEOIVz8/QsnPg3bwbE9r6QHo1o5rtA+Ks BrpuoG53PAEX3BITyDWOmu60atL3I88N2AFgTLvq1/QD88ZtkpfsfHdlhERR4zfd0jnm Q1yhY7bizo2FaOWizRWSqS/MZsNIVxij8Z2ufvvMzUKmjvCQa+AMRlt8vvZqyxFz6aHg 4NsEEQctPUW1TviYStvZoRrC5X3An9jlajW9ksXpVwafwWRO33wjDLWUVdUUv7qn9WgY rsLA== 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=+ilrnVPCgqCg7Re8/mNh2Jua5UAUuT+O2HB50pqHRDU=; b=cHvpuMY59ex/6/5WqLGFmendm17NoslKLReYnGtQ7Zdeyxpgn9tYmeAJN1BnnVfwKp kbBMDVCXTqON31mIB88SAkfoTLDkhCKX9lz57MY1VBuZ1/4oz1t85DE3jK7Nhk45ui7h VZZ0APOrEq/8aRQXOl5t4rN9+pYnhytdD729gLagETR2/smeHicyghSqdz4hL1Irp4Rh kvmbjCvfXm63AUqhT8sBZjM6ZLX6NnrbXe5lCsnGXBDt+9uYSX1TS5WJO/A15W41s1iI 5UPINE2CbI0DK2Otrceb5z+kj+z4Qn6aQG29jxG4CY85U7dUMVASul5OsLIXFWZSvh/c vD9Q== 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 d12si11655115pln.340.2018.11.14.05.47.34; Wed, 14 Nov 2018 05:47:34 -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 S1732931AbeKNXuw (ORCPT + 1 other); Wed, 14 Nov 2018 18:50:52 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:36345 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732801AbeKNXuw (ORCPT ); Wed, 14 Nov 2018 18:50:52 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id CE697C82F4D5E; Wed, 14 Nov 2018 21:46:53 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Wed, 14 Nov 2018 21:46:45 +0800 From: John Garry To: , CC: , , , , , , John Garry Subject: [PATCH 2/5] scsi: libsas: Use pr_fmt(fmt) Date: Wed, 14 Nov 2018 21:47:46 +0800 Message-ID: <1542203269-174932-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1542203269-174932-1-git-send-email-john.garry@huawei.com> References: <1542203269-174932-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 In preparation for dropping the libsas printk wrappers, use pr_fmt(fmt) declaration to add the framework log prefix - "sas". Suggested-by: Joe Perches Signed-off-by: John Garry --- drivers/scsi/libsas/sas_internal.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 50e12d6..30f4154 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -32,9 +32,16 @@ #include #include -#define sas_printk(fmt, ...) printk(KERN_NOTICE "sas: " fmt, ## __VA_ARGS__) +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) "sas: " fmt + +#define sas_printk(fmt, ...) printk(KERN_NOTICE fmt, ## __VA_ARGS__) + +#define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG fmt, ## __VA_ARGS__) -#define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG "sas: " fmt, ## __VA_ARGS__) #define TO_SAS_TASK(_scsi_cmd) ((void *)(_scsi_cmd)->host_scribble) #define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0) From patchwork Wed Nov 14 13:47:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 151091 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5710202ljp; Wed, 14 Nov 2018 05:48:51 -0800 (PST) X-Google-Smtp-Source: AJdET5cFq2gyJtftbzqaH7+qrauBQnIZoQAnHphgBvKSGogRf3/cnLtN4uvP5+ZYP9tA3OCWvWp6 X-Received: by 2002:a62:9f42:: with SMTP id g63-v6mr2045900pfe.144.1542203330987; Wed, 14 Nov 2018 05:48:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542203330; cv=none; d=google.com; s=arc-20160816; b=Sg3q4b0GgcHhv0taG0WiFM78qvIJHvSHtTaNQ3YaSqWYxXmYX/2exoTXpOM7U0Kiq9 VIwqFDatRANas/yMvx0vEzaZ9sb10EAnqqO0yCk/BRguuomtc9wAmY90xPK/ST/5l8bQ 4qd05+jE0JTgionXc89gE/5OJWnIjXphh+RYGFKoNj2lMSi71N82h+0CeqW17F9tm4yV G6SFIyljGVZSRTFazzCPzgD1vvrEdZPp3WK5bpmMdoaeuJw/3tehVVeKHKfmb9yRWMMA jKnAR4BZR2jz7x3Ev+SG2RRHaDu9vuBF98iyPHvcmnLwrmnEZv8uH5sbKChQcFMFzzJo RrcA== 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=1gD9bcJbM0Ofx+WHt3WZKRKCv6cCl3uNRMKCdufIuQE=; b=IqIu9b/0myLLry94rasevzpqbf0VVfNEw/w5AiLTTfaTwnPGgvdSMdpBgjbjwiUVhC 67OvniY/xL3kJNu1XrxFAb9rQ0Hhgf67eO+CsZV3N7gODCLvKRA3lUt70m5QsTlmgCQj CDMa9Wfweo22aGLCWbkY+TmjqUn7vmFsChSGYQLti06Y8gpjBiqQDMSLjGgB5+jcdpGX 9p0Y1dV/w/lyqbwJP5FZKeujz0Nfm9oTMGAsRfhnxlb3Cl7mUQlxIefsVCWJ+detTPDL vJGGIJuPSCLazZzC2eeX0rH84QYGhHVv0fbBNWtqpZl4ba3++XbpivYi5Wht0KK/WqB/ yulQ== 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 k91-v6si25005198pld.209.2018.11.14.05.48.50; Wed, 14 Nov 2018 05:48:50 -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 S1733242AbeKNXwJ (ORCPT + 1 other); Wed, 14 Nov 2018 18:52:09 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:36352 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732432AbeKNXwJ (ORCPT ); Wed, 14 Nov 2018 18:52:09 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id D3AECCBDDB3F1; Wed, 14 Nov 2018 21:46:53 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Wed, 14 Nov 2018 21:46:46 +0800 From: John Garry To: , CC: , , , , , , John Garry Subject: [PATCH 3/5] scsi: libsas: Drop sas_printk() Date: Wed, 14 Nov 2018 21:47:47 +0800 Message-ID: <1542203269-174932-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1542203269-174932-1-git-send-email-john.garry@huawei.com> References: <1542203269-174932-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. 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, 17 insertions(+), 19 deletions(-) -- 1.9.1 diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 0d1f727..fdc8384 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,19 @@ 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 30f4154..257f8ed 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -38,8 +38,6 @@ #define pr_fmt(fmt) "sas: " 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 ---------- */