From patchwork Fri Mar 2 15:06:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 130552 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1377368lja; Fri, 2 Mar 2018 07:09:56 -0800 (PST) X-Google-Smtp-Source: AG47ELvKXGxVO+3IEGdO69ib8gOgMT904Te3Y/7wtFqut5g+lAZJzAjO44eySvqFDJkjCyv+u54K X-Received: by 10.99.44.22 with SMTP id s22mr4813252pgs.111.1520003396143; Fri, 02 Mar 2018 07:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520003396; cv=none; d=google.com; s=arc-20160816; b=oY353XmIWxfRBMN2MLQLmQlUhgbUc9MtHpFjcDK7TtYYnF73LBXqU57pTCiMXi0TB9 UZPIMtY4TOHKobtxVyhgfhgDjmXA59EXzHLBuz1EMT/5TSZBgom+ULMG9UPilc6AU0+e IVoqOUD02MC77zghYhIqaxvzF12tikeDC4zlz7Xxondz6/LJj/HPyWydSJuWKOtTSgrv 7nHkJVssX/wufrwWSD5KxWrabdFYdDw0fRrkIlbG0l/DwInWaBvJ/EuwAFpqZOwwz9Jk Oq/xsPC8VwjOUKnManNNV/RoXn5Go8JfRVAe4/DJ3hAZnR+2PDwhZbYgpp3pH4gt5FEw KiwQ== 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:arc-authentication-results; bh=8UAzgAWWlizfrbRx3qWOnEynZ3imRD4cJK0Psd/vlFs=; b=oMDUhsz7bXxFA3uY33m0vUH6n/dyIY66rwEE4hPPLF5othubF4HkIfcPiaa7egHpZ1 1N85Fuh8i/Hte+svt6r4r3YqpgX47iPSB8yToB7Z+FVaQSAUwpFp4a08HEcMJtMeuvct YS2gayYuw27QXyAQ5A2/yxZ+A+fdaGY9/ztqsdn0aA4a4mJYX1lOjJdW6WNY+kZtKlbu l/fvBpkLane2oQQd1zHG5tuKfpXWj8zolIG/nj+CU7/savFRuJeY2A3mx+HymXFgGguk nzTMe7Q2IwzhHC0UUyVq1cZf0Rux08NgMJ9juxbwIp+ZK8KqZWSsAo3SohT2qvJliaRw duJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 u6-v6si4964040pld.129.2018.03.02.07.09.55; Fri, 02 Mar 2018 07:09:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1429040AbeCBPHz (ORCPT + 28 others); Fri, 2 Mar 2018 10:07:55 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:5727 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1423518AbeCBPHu (ORCPT ); Fri, 2 Mar 2018 10:07:50 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id F040616E736B0; Fri, 2 Mar 2018 23:07:32 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.361.1; Fri, 2 Mar 2018 23:07:29 +0800 From: John Garry To: , , , CC: , , , , Xiang Chen , John Garry Subject: [PATCH v2 6/8] scsi: hisi_sas: remove unused variable hisi_sas_devices.running_req Date: Fri, 2 Mar 2018 23:06:20 +0800 Message-ID: <1520003182-26277-7-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520003182-26277-1-git-send-email-john.garry@huawei.com> References: <1520003182-26277-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen The structure element hisi_sas_devices.running_req to count how many commands are active is in effect only ever written in the code, so remove it. Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas.h | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 9 --------- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 --- 3 files changed, 13 deletions(-) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h index e7fd287..d1153e8 100644 --- a/drivers/scsi/hisi_sas/hisi_sas.h +++ b/drivers/scsi/hisi_sas/hisi_sas.h @@ -175,7 +175,6 @@ struct hisi_sas_device { struct hisi_sas_dq *dq; struct list_head list; u64 attached_phy; - atomic64_t running_req; enum sas_device_type dev_type; int device_id; int sata_idx; diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 9ff8790..88ad8d4 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -200,8 +200,6 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, if (task) { struct device *dev = hisi_hba->dev; - struct domain_device *device = task->dev; - struct hisi_sas_device *sas_dev = device->lldd_dev; if (!task->lldd_task) return; @@ -213,9 +211,6 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, dma_unmap_sg(dev, task->scatter, task->num_scatter, task->data_dir); - - if (sas_dev) - atomic64_dec(&sas_dev->running_req); } if (slot->buf) @@ -431,8 +426,6 @@ static int hisi_sas_task_prep(struct sas_task *task, struct hisi_sas_dq spin_unlock_irqrestore(&task->task_state_lock, flags); dq->slot_prep = slot; - - atomic64_inc(&sas_dev->running_req); ++(*pass); return 0; @@ -1517,8 +1510,6 @@ static int hisi_sas_query_task(struct sas_task *task) dq->slot_prep = slot; - atomic64_inc(&sas_dev->running_req); - /* send abort command to the chip */ hisi_hba->hw->start_delivery(dq); spin_unlock_irqrestore(&dq->lock, flags_dq); diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index 2eb8980..8dd0e6a6 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -1407,9 +1407,6 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba, } out: - if (sas_dev) - atomic64_dec(&sas_dev->running_req); - hisi_sas_slot_task_free(hisi_hba, task, slot); sts = ts->stat;