From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755543AbbLFEEx (ORCPT ); Sat, 5 Dec 2015 23:04:53 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:53131 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754074AbbLFDn5 (ORCPT ); Sat, 5 Dec 2015 22:43:57 -0500 Message-Id: <20151206013129.945485558@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Sun, 06 Dec 2015 12:31:38 +1100 From: Finn Thain To: "James E.J. Bottomley" , Michael Schmitz , , , Subject: [PATCH v2 12/72] ncr5380: Remove unused hostdata->aborted flag References: <20151206013126.995379403@telegraphics.com.au> Content-Disposition: inline; filename=ncr5380-remove-unused-aborted-flag Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The aborted flag was introduced in v1.1.38 but never used. Remove it. Signed-off-by: Finn Thain Reviewed-by: Hannes Reinecke --- drivers/scsi/NCR5380.c | 2 -- drivers/scsi/NCR5380.h | 1 - drivers/scsi/atari_NCR5380.c | 2 -- 3 files changed, 5 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2015-12-06 12:29:38.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2015-12-06 12:29:39.000000000 +1100 @@ -781,7 +781,6 @@ static int NCR5380_init(struct Scsi_Host if(in_interrupt()) printk(KERN_ERR "NCR5380_init called with interrupts off!\n"); - hostdata->aborted = 0; hostdata->id_mask = 1 << instance->this_id; for (i = hostdata->id_mask; i <= 0x80; i <<= 1) if (i > hostdata->id_mask) @@ -2574,7 +2573,6 @@ static int NCR5380_abort(struct scsi_cmn if (hostdata->connected == cmd) { dprintk(NDEBUG_ABORT, "scsi%d : aborting connected command\n", instance->host_no); - hostdata->aborted = 1; /* * We should perform BSY checking, and make sure we haven't slipped * into BUS FREE. Index: linux/drivers/scsi/atari_NCR5380.c =================================================================== --- linux.orig/drivers/scsi/atari_NCR5380.c 2015-12-06 12:29:38.000000000 +1100 +++ linux/drivers/scsi/atari_NCR5380.c 2015-12-06 12:29:39.000000000 +1100 @@ -813,7 +813,6 @@ static int __init NCR5380_init(struct Sc SETUP_HOSTDATA(instance); hostdata->host = instance; - hostdata->aborted = 0; hostdata->id_mask = 1 << instance->this_id; hostdata->id_higher_mask = 0; for (i = hostdata->id_mask; i <= 0x80; i <<= 1) @@ -2834,7 +2833,6 @@ int NCR5380_abort(struct scsi_cmnd *cmd) */ if (do_abort(instance) == 0) { - hostdata->aborted = 1; hostdata->connected = NULL; cmd->result = DID_ABORT << 16; #ifdef SUPPORT_TAGS Index: linux/drivers/scsi/NCR5380.h =================================================================== --- linux.orig/drivers/scsi/NCR5380.h 2015-12-06 12:29:36.000000000 +1100 +++ linux/drivers/scsi/NCR5380.h 2015-12-06 12:29:39.000000000 +1100 @@ -271,7 +271,6 @@ struct NCR5380_hostdata { volatile int restart_select; /* we have disconnected, used to restart NCR5380_select() */ - volatile unsigned aborted:1; /* flag, says aborted */ int flags; unsigned long time_expires; /* in jiffies, set prior to sleeping */ int select_time; /* timer in select for target response */