From patchwork Wed Feb 6 10:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 157608 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6262358jaa; Wed, 6 Feb 2019 02:52:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IYYuEr1th6HrJ0aWF8H6HxCZVWLFoUWUj5A6giKaQBhHfzA01alrd5hx+YtFsQGxAZHQA4P X-Received: by 2002:a63:ea4f:: with SMTP id l15mr8885799pgk.102.1549450365721; Wed, 06 Feb 2019 02:52:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549450365; cv=none; d=google.com; s=arc-20160816; b=iDP24AsvSoC+5yig9X1ilQYkvl886C5AtJPpXpTHhnarDDPkHQkSbVcnUArcESEZGv tfan0gHCGccfO0EGe7EtpJtfewuhBpUeWi1EIV4BSQ9y81ygzw+9peVlGof9zUGslek1 elYpkWhhPcNdWvXg18stiATf72wTxk+MWQwlkptq1tPlWAPf7LNiW2myUUse23DPlIkK 948gBQOlg4uERRW7H/2/tw9oflxhX8loxh3HUaduQgsD/DU8MOjPUweXgAJOHdlgez0z x83Fnm7BvDSXEPg7L5kUHgX9+t4AQtMye6asOhAUQqteLhTrHz6NrzkdiwIruSMUJlpI KHFw== 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=ECKry4ePfBCzRTtEzLJAy6wSyglocslgrUvgc0wvZ44=; b=MpyjDmxQZxrA5UHdEsdfCu5HYg0XTXT53CVDtJ8M3Orhk4pvU362R9Ww2VP8WwE0Aj +TAu1c0nc6awSju6ciQl/uDM6Y0AzViPfE1eP4Ji/C7Sa8KMHHiug5slbazIXBYqZEEw L3n6JZCceaZDoXZHQQkPIOInoG0MBjFf9mqOXEcFJS7eTM/7etqk8gr4d/pIBc57d+kY 4hXYPDrH3w/cPp6593KB26ivggU1EnXICiw56QPkAJOKHIiEWgJkAX+FbTggF04t/ZMN AFZGWZszG0oEqvOKGB1obgi2phkZNDwd6mu7Wpsk8q35ZZXDZbOJb60fCrlXn/ekxUsL evTA== 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 m3si172983pld.331.2019.02.06.02.52.45; Wed, 06 Feb 2019 02:52:45 -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 S1729214AbfBFKwo (ORCPT + 31 others); Wed, 6 Feb 2019 05:52:44 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:36636 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728883AbfBFKwi (ORCPT ); Wed, 6 Feb 2019 05:52:38 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id DAAA4400832AE54A9AB7; Wed, 6 Feb 2019 18:52:35 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.408.0; Wed, 6 Feb 2019 18:52:25 +0800 From: John Garry To: , CC: , , , John Garry Subject: [PATCH 6/6] scsi: hisi_sas: Do some more tidy-up Date: Wed, 6 Feb 2019 18:52:56 +0800 Message-ID: <1549450376-114929-7-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1549450376-114929-1-git-send-email-john.garry@huawei.com> References: <1549450376-114929-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 Do some very minor tidy-up, for things like needlessly initing variable and not leaving whitespace before quote endings. Originally-from: Xiang Chen Originally-from: Luo Jiaxing Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 10 +++++----- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index eff31472b96e..923296653ed7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -144,7 +144,7 @@ EXPORT_SYMBOL_GPL(hisi_sas_get_ncq_tag); */ u8 hisi_sas_get_prog_phy_linkrate_mask(enum sas_linkrate max) { - u16 rate = 0; + u8 rate = 0; int i; max -= SAS_LINK_RATE_1_5_GBPS; @@ -1180,7 +1180,7 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, task->task_done = hisi_sas_task_done; task->slow_task->timer.function = hisi_sas_tmf_timedout; - task->slow_task->timer.expires = jiffies + TASK_TIMEOUT*HZ; + task->slow_task->timer.expires = jiffies + TASK_TIMEOUT * HZ; add_timer(&task->slow_task->timer); res = hisi_sas_task_exec(task, GFP_KERNEL, 1, tmf); @@ -1701,8 +1701,8 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) static int hisi_sas_clear_aca(struct domain_device *device, u8 *lun) { - int rc = TMF_RESP_FUNC_FAILED; struct hisi_sas_tmf_task tmf_task; + int rc; tmf_task.tmf = TMF_CLEAR_ACA; rc = hisi_sas_debug_issue_ssp_tmf(device, lun, &tmf_task); @@ -1752,7 +1752,7 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device) { struct hisi_hba *hisi_hba = dev_to_hisi_hba(device); struct device *dev = hisi_hba->dev; - int rc = TMF_RESP_FUNC_FAILED; + int rc; rc = hisi_sas_internal_task_abort(hisi_hba, device, HISI_SAS_INT_ABT_DEV, 0); @@ -2005,7 +2005,7 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, task->task_proto = device->tproto; task->task_done = hisi_sas_task_done; task->slow_task->timer.function = hisi_sas_tmf_timedout; - task->slow_task->timer.expires = jiffies + INTERNAL_ABORT_TIMEOUT*HZ; + task->slow_task->timer.expires = jiffies + INTERNAL_ABORT_TIMEOUT * HZ; add_timer(&task->slow_task->timer); res = hisi_sas_internal_abort_task_exec(hisi_hba, sas_dev->device_id, diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index d734aef263d1..0f05fd409f6b 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -11,7 +11,7 @@ #include "hisi_sas.h" #define DRV_NAME "hisi_sas_v3_hw" -/* global registers need init*/ +/* global registers need init */ #define DLVRY_QUEUE_ENABLE 0x0 #define IOST_BASE_ADDR_LO 0x8 #define IOST_BASE_ADDR_HI 0xc @@ -728,7 +728,7 @@ static void clear_itct_v3_hw(struct hisi_hba *hisi_hba, hisi_sas_write32(hisi_hba, ENT_INT_SRC3, ENT_INT_SRC3_ITC_INT_MSK); - /* clear the itct table*/ + /* clear the itct table */ reg_val = ITCT_CLR_EN_MSK | (dev_id & ITCT_DEV_MSK); hisi_sas_write32(hisi_hba, ITCT_CLR, reg_val);