From patchwork Mon Oct 17 09:20:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 3284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1338712wrs; Mon, 17 Oct 2022 01:51:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7czZDIWx8wO8E5xcw/vcRHfHgfTfiFmAXN5ONoRfqMC6OOAAse5p5KnuBiCssJt3iD4dKZ X-Received: by 2002:a17:906:dac9:b0:780:ab6f:591f with SMTP id xi9-20020a170906dac900b00780ab6f591fmr7782621ejb.77.1665996697693; Mon, 17 Oct 2022 01:51:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665996697; cv=none; d=google.com; s=arc-20160816; b=z//pF/dR9fboRD7V1vdcFnclxdQmyPZKn2j6nC2DDvRVKI7yra693h1GEyDDavrp6E uyZo1+KF7PsAs0S4LoKhAUu9ssrjwotkmDuwv7xgeu7cdTsv7wi5QLC1JT0WMUfVFCLM OK8DbzwFqbNpH86269nD8zIHpvNadLV5iLyKHLaNe9lnKsPquV4RJ81eehjpA1NrDH0z 6JfZYucM1tAGO2iy1k/per4p1VE6jValApmaP5fFfd7RFd+N5cOiTALKVNamkwbHhH2C EBE2ndtaR9QWnrCKM7QsA/A7oRzt5o6qbepbywvVc8/rB1OaRXthDLr/00APKxh9o8wK naKA== 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=AZNhd4TyuLLRcV2s89XxTMZEUgHqsJa4QKntoKGhcbI=; b=PqRvjXWteLQ+tCxfZYGBx2hX/6VDFoZI+9QL0BxdcEd82Mk4MOwqJpnBmDdHYpaJoz sVEDTqlJreSzyDhrFm+/veqE8zmMawSV8DAm10wz9GdmiWYVYRePA06Jh5ezsgL80Tms +Bajz2JDo29pKf0ZRiVkm3O5V5ihT/NwZopNlO+x7GFqII/AfDbPISQZUzR7ubA/ofmc ITxYZLMzHvTaPOYFQgAu+PgLeBj/bcQR24hMec6Vr6vX4vTdSN5NEMWVFSUzVs31YzZv 6XIHLVGTvB9hA5DJMZQPKQ4pkd4Gtn1T555+Jx7vvxeFuMSL1mwKA1Y30XqD4RM2563E Uj+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v17-20020aa7d9d1000000b0045879feb9fcsi7816057eds.185.2022.10.17.01.51.12; Mon, 17 Oct 2022 01:51:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbiJQIu1 (ORCPT + 99 others); Mon, 17 Oct 2022 04:50:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbiJQIuY (ORCPT ); Mon, 17 Oct 2022 04:50:24 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77AA52CDF6; Mon, 17 Oct 2022 01:50:19 -0700 (PDT) Received: from fraeml743-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4MrVwv5gM9z6J69C; Mon, 17 Oct 2022 16:47:11 +0800 (CST) Received: from lhrpeml500003.china.huawei.com (7.191.162.67) by fraeml743-chm.china.huawei.com (10.206.15.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 17 Oct 2022 10:50:16 +0200 Received: from localhost.localdomain (10.69.192.58) by lhrpeml500003.china.huawei.com (7.191.162.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 17 Oct 2022 09:50:14 +0100 From: John Garry To: , , , CC: , , , , , "John Garry" Subject: [PATCH v6 2/8] scsi: hisi_sas: Move slot variable definition in hisi_sas_abort_task() Date: Mon, 17 Oct 2022 17:20:29 +0800 Message-ID: <1665998435-199946-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1665998435-199946-1-git-send-email-john.garry@huawei.com> References: <1665998435-199946-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 lhrpeml500003.china.huawei.com (7.191.162.67) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746924153461948226?= X-GMAIL-MSGID: =?utf-8?q?1746924153461948226?= Each branch currently defines a slot variable independently, and it is neater to move it to the function head. Signed-off-by: Xingui Yang Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 699b07abb6b0..8303aa5eaf25 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1547,6 +1547,7 @@ static int hisi_sas_abort_task(struct sas_task *task) struct hisi_sas_internal_abort_data internal_abort_data = { false }; struct domain_device *device = task->dev; struct hisi_sas_device *sas_dev = device->lldd_dev; + struct hisi_sas_slot *slot = task->lldd_task; struct hisi_hba *hisi_hba; struct device *dev; int rc = TMF_RESP_FUNC_FAILED; @@ -1560,7 +1561,6 @@ static int hisi_sas_abort_task(struct sas_task *task) spin_lock_irqsave(&task->task_state_lock, flags); if (task->task_state_flags & SAS_TASK_STATE_DONE) { - struct hisi_sas_slot *slot = task->lldd_task; struct hisi_sas_cq *cq; if (slot) { @@ -1578,8 +1578,7 @@ static int hisi_sas_abort_task(struct sas_task *task) task->task_state_flags |= SAS_TASK_STATE_ABORTED; spin_unlock_irqrestore(&task->task_state_lock, flags); - if (task->lldd_task && task->task_proto & SAS_PROTOCOL_SSP) { - struct hisi_sas_slot *slot = task->lldd_task; + if (slot && task->task_proto & SAS_PROTOCOL_SSP) { u16 tag = slot->idx; int rc2; @@ -1613,9 +1612,8 @@ static int hisi_sas_abort_task(struct sas_task *task) hisi_sas_dereg_device(hisi_hba, device); rc = hisi_sas_softreset_ata_disk(device); } - } else if (task->lldd_task && task->task_proto & SAS_PROTOCOL_SMP) { + } else if (slot && task->task_proto & SAS_PROTOCOL_SMP) { /* SMP */ - struct hisi_sas_slot *slot = task->lldd_task; u32 tag = slot->idx; struct hisi_sas_cq *cq = &hisi_hba->cq[slot->dlvry_queue];