From patchwork Fri Aug 13 13:49:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 496564 Delivered-To: patch@linaro.org Received: by 2002:a02:cf8a:0:0:0:0:0 with SMTP id w10csp585283jar; Fri, 13 Aug 2021 06:54:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu5c9s+H0dsUpQe7BksnwGCs2DwWeWUYffkCtI7zG1MjWU9kWnMpjMB7oK5jjBkbnAGW1d X-Received: by 2002:a17:906:769a:: with SMTP id o26mr2662855ejm.18.1628862851332; Fri, 13 Aug 2021 06:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628862851; cv=none; d=google.com; s=arc-20160816; b=rtqPsiMcs1czi6LCyCRGekJD0qEvuwM2g6dNThVqZoYg0tKR3ua9b++VNOWGIujjK+ boNadIzY6IbtYuG78apLMvGvv1tzaPQ66YFWH7m7df9OdY2uWUiPm/wJnco1Lu8NGjw3 mrlHzK+zZEhErF+b+XledqGG6UvD95u7eTxu/tZN+rFP9fLspv7vC7ZzNP3KMIOn7gF1 JSUiZeRRm+Ytqt29bda0h2dHJf4k13mHF9jlZvExVGQxXDmbyqkeRuXXLDSNGJXd4Be7 f+WPSASQGipy4EeltwCmUUVXH4wA7igobKSUoxRwl1TaehUupcAQznT5ih1ffN/w6b+G TiXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=u4K6I3ZosRRoJgbkkk1qOY1ny0jl6Jb/RVFFVGqcUPY=; b=frruCSsUd6Dgxse/B1+AAyHBXHkZofFLSO8Rd7BIWTfdkzZ/SIzBZmBB5yqodKkpYO o1BkfrmelufZm/Jca3X2u8zeQEFEg3V/1dFSudGmalwWaMib0iCAX9QwMiby94npF8wU /4bAfJwRZyfeHVQm2Hqr5dDlSyERVJhxWKHs/9S7UZlnawV+lkcmeCtglM6I6yhmpgwv y2NITvcjvXduRDWp0iebt47TFgoHAeDdgLfH1vBirbXj9ZXM/Qch6jiAkzN6HILMPQAh FneT16LBwjFN8LBgE713QZ3UBAP666a863RN7AO16uWxxRuJKItI2g0/wvcOuKoneCVc XYyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id aq6si1764414ejc.589.2021.08.13.06.54.11 for ; Fri, 13 Aug 2021 06:54:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240755AbhHMNyf (ORCPT ); Fri, 13 Aug 2021 09:54:35 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3647 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240678AbhHMNye (ORCPT ); Fri, 13 Aug 2021 09:54:34 -0400 Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GmQ4h4Dl2z6GBx3; Fri, 13 Aug 2021 21:53:24 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Fri, 13 Aug 2021 15:54:06 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 13 Aug 2021 14:54:03 +0100 From: John Garry To: , , , , CC: , , , , , John Garry Subject: [PATCH 1/3] scsi: wd719: Stop using scsi_cmnd.tag Date: Fri, 13 Aug 2021 21:49:11 +0800 Message-ID: <1628862553-179450-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1628862553-179450-1-git-send-email-john.garry@huawei.com> References: <1628862553-179450-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use scsi_cmd_to_rq(cmd)->tag instead. Signed-off-by: John Garry --- drivers/scsi/wd719x.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.26.2 Reviewed-by: Hannes Reinecke Reviewed-by: Bart Van Assche diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c index edc8a139a60d..622aec075aba 100644 --- a/drivers/scsi/wd719x.c +++ b/drivers/scsi/wd719x.c @@ -466,14 +466,16 @@ static int wd719x_abort(struct scsi_cmnd *cmd) unsigned long flags; struct wd719x_scb *scb = scsi_cmd_priv(cmd); struct wd719x *wd = shost_priv(cmd->device->host); + struct device *dev = &wd->pdev->dev; - dev_info(&wd->pdev->dev, "abort command, tag: %x\n", cmd->tag); + dev_info(dev, "abort command, tag: %x\n", scsi_cmd_to_rq(cmd)->tag); - action = /*cmd->tag ? WD719X_CMD_ABORT_TAG : */WD719X_CMD_ABORT; + action = /*tag ? WD719X_CMD_ABORT_TAG : */WD719X_CMD_ABORT; spin_lock_irqsave(wd->sh->host_lock, flags); result = wd719x_direct_cmd(wd, action, cmd->device->id, - cmd->device->lun, cmd->tag, scb->phys, 0); + cmd->device->lun, scsi_cmd_to_rq(cmd)->tag, + scb->phys, 0); wd719x_finish_cmd(scb, DID_ABORT); spin_unlock_irqrestore(wd->sh->host_lock, flags); if (result)