From patchwork Thu Oct 31 11:04:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 11220981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1241A1599 for ; Thu, 31 Oct 2019 11:05:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E40652087F for ; Thu, 31 Oct 2019 11:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727493AbfJaLFe (ORCPT ); Thu, 31 Oct 2019 07:05:34 -0400 Received: from mx2.suse.de ([195.135.220.15]:37444 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727529AbfJaLFb (ORCPT ); Thu, 31 Oct 2019 07:05:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 09C87B373; Thu, 31 Oct 2019 11:05:28 +0000 (UTC) From: Hannes Reinecke To: "Martin K. Petersen" Cc: Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org, Hannes Reinecke Subject: [PATCH 14/24] scsi: Kill DRIVER_HARD Date: Thu, 31 Oct 2019 12:04:42 +0100 Message-Id: <20191031110452.73463-15-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191031110452.73463-1-hare@suse.de> References: <20191031110452.73463-1-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Unused. Signed-off-by: Hannes Reinecke --- drivers/scsi/constants.c | 2 +- include/scsi/scsi.h | 1 - include/trace/events/scsi.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index 7809bf618606..b2ba83e6b98d 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -408,7 +408,7 @@ static const char * const hostbyte_table[]={ static const char * const driverbyte_table[]={ "DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT", "DRIVER_MEDIA", "DRIVER_ERROR", -"DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD"}; +"DRIVER_INVALID", "DRIVER_TIMEOUT"}; const char *scsi_hostbyte_string(int result) { diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index f68c234dd3e8..407e188a0aae 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -172,7 +172,6 @@ static inline int scsi_is_wlun(u64 lun) #define DRIVER_INVALID 0x05 #define DRIVER_TIMEOUT 0x06 -#define DRIVER_HARD 0x07 /* * Internal return values. diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h index 404fbc54bc32..e15373917d1e 100644 --- a/include/trace/events/scsi.h +++ b/include/trace/events/scsi.h @@ -133,8 +133,7 @@ scsi_driverbyte_name(DRIVER_MEDIA), \ scsi_driverbyte_name(DRIVER_ERROR), \ scsi_driverbyte_name(DRIVER_INVALID), \ - scsi_driverbyte_name(DRIVER_TIMEOUT), \ - scsi_driverbyte_name(DRIVER_HARD)) + scsi_driverbyte_name(DRIVER_TIMEOUT)) #define scsi_msgbyte_name(result) { result, #result } #define show_msgbyte_name(val) \