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) {