From patchwork Tue Sep 1 11:13:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 248843 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4127474ilg; Tue, 1 Sep 2020 04:23:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYZQF0fQvppToeXw7otl7c9isMzdXZSERTefwzxzOE0PbNTYcgPBfRfqiTD5rlH162wxCk X-Received: by 2002:a17:906:4c81:: with SMTP id q1mr1006270eju.72.1598959392134; Tue, 01 Sep 2020 04:23:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598959392; cv=none; d=google.com; s=arc-20160816; b=tQC269pX10uTL9N4NlrSL+n2GJXKZ0YdaL50YxcXJtls75/JjkWrNYU3V3wicr8Xz3 s+t0ML0ntU5cz8qLlbeOuOyj3p3NS3Ire+4ul3unbNmQOYtJHfdjFj+U0ZUcMTAdt/G9 8WVwgX0OsSNBqhDLLaGVa6arXVrD2bpzR69aoLPWYYQbwjRjNT4PvcKy8sP6Qkwnutl4 A5nd4uKmw9hlXSNxZnAGZzlMCX2wmUhQUBqjt0YyY7afOriIDecsa6f2+QvfHWw0nn8O +OFtfSiodKadzKK2vlbMpY9bx2nualTBXD98IB9WR3BWBhJVYv9KdvEWAHyz7fr+MUzz dtXA== 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; bh=i+Xip9fok79L9n/uidp9ELLvYbda6LpuchM5U2ZwLsk=; b=JD4EoeiTFqrAWzeOitGF+wk5AObXM7+63Edyb3WSfsmVNeRCN93olRCB6ajkgI4EMD 5y7AoZYq6nCy5mtldPICWjeR/kZEAXyfUYsnoMwn4coEcsSND8P7KkoO+qemEPmPwMRd WRpXGp9nNYgYmPt/t/Gh2GbNNnOTmDtmOtAr5lm2TQh6kHH3pxOhYCEV53MDsVc4Teo8 deEfSkGzM7GOO/xix1eP7IeW54bwhI2vJZlDSXHvsZmkw5Y/HSPkU/MUmoca7FKn4OT/ 8/LgDTTRqOm0BYJW+4vAJ/wS/I8/DfLnPAMQXjMlbk+qZJvVWfXRqFnhe9d6FXhvwUyy VpQw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v8si470451ejw.434.2020.09.01.04.23.11 for ; Tue, 01 Sep 2020 04:23:12 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726594AbgIALWi (ORCPT ); Tue, 1 Sep 2020 07:22:38 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:47606 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726285AbgIALTu (ORCPT ); Tue, 1 Sep 2020 07:19:50 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5F488E04F8117BC3CBA4; Tue, 1 Sep 2020 19:17:07 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Sep 2020 19:17:00 +0800 From: John Garry To: , CC: , , , Luo Jiaxing , John Garry Subject: [PATCH 8/8] scsi: hisi_sas: Some very minor tidying Date: Tue, 1 Sep 2020 19:13:10 +0800 Message-ID: <1598958790-232272-9-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1598958790-232272-1-git-send-email-john.garry@huawei.com> References: <1598958790-232272-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Luo Jiaxing We found an extra blank line at the end of some functions, so delete them. And add spaces around some operators. Signed-off-by: Luo Jiaxing Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) -- 2.26.2 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index f5ad8e662b4b..f18452942508 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1430,7 +1430,6 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state) } else { hisi_sas_phy_down(hisi_hba, phy_no, 0); } - } } diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 68d07a4f8422..b57177b52fac 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -1202,7 +1202,7 @@ static void init_reg_v2_hw(struct hisi_hba *hisi_hba) hisi_sas_write32(hisi_hba, ENT_INT_SRC_MSK3, 0x7ffe20fe); hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, 0xfff00c30); for (i = 0; i < hisi_hba->queue_count; i++) - hisi_sas_write32(hisi_hba, OQ0_INT_SRC_MSK+0x4*i, 0); + hisi_sas_write32(hisi_hba, OQ0_INT_SRC_MSK + 0x4 * i, 0); hisi_sas_write32(hisi_hba, AXI_AHB_CLK_CFG, 1); hisi_sas_write32(hisi_hba, HYPER_STREAM_ID_EN_CFG, 1); diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 397846388e85..87bda037303f 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -596,7 +596,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba) hisi_sas_write32(hisi_hba, AWQOS_AWCACHE_CFG, 0xf0f0); hisi_sas_write32(hisi_hba, ARQOS_ARCACHE_CFG, 0xf0f0); for (i = 0; i < hisi_hba->queue_count; i++) - hisi_sas_write32(hisi_hba, OQ0_INT_SRC_MSK+0x4*i, 0); + hisi_sas_write32(hisi_hba, OQ0_INT_SRC_MSK + 0x4 * i, 0); hisi_sas_write32(hisi_hba, HYPER_STREAM_ID_EN_CFG, 1); @@ -1350,7 +1350,6 @@ static void prep_smp_v3_hw(struct hisi_hba *hisi_hba, hdr->cmd_table_addr = cpu_to_le64(req_dma_addr); hdr->sts_buffer_addr = cpu_to_le64(hisi_sas_status_buf_addr_dma(slot)); - } static void prep_ata_v3_hw(struct hisi_hba *hisi_hba, @@ -1456,7 +1455,6 @@ static void prep_abort_v3_hw(struct hisi_hba *hisi_hba, /* dw7 */ hdr->dw7 = cpu_to_le32(tag_to_abort << CMD_HDR_ABORT_IPTT_OFF); hdr->transfer_tags = cpu_to_le32(slot->idx); - } static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)