From patchwork Thu Jun 4 22:58:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 6550501 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CBAA5C0020 for ; Thu, 4 Jun 2015 22:58:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9F7B2047C for ; Thu, 4 Jun 2015 22:58:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9230B2043C for ; Thu, 4 Jun 2015 22:58:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753672AbbFDW6W (ORCPT ); Thu, 4 Jun 2015 18:58:22 -0400 Received: from mail-bn1on0087.outbound.protection.outlook.com ([157.56.110.87]:32256 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752184AbbFDW6U (ORCPT ); Thu, 4 Jun 2015 18:58:20 -0400 Received: from BY2PR02CA0070.namprd02.prod.outlook.com (10.242.32.28) by SN1PR0201MB1552.namprd02.prod.outlook.com (25.163.129.27) with Microsoft SMTP Server (TLS) id 15.1.172.22; Thu, 4 Jun 2015 22:58:19 +0000 Received: from BN1AFFO11FD029.protection.gbl (2a01:111:f400:7c10::100) by BY2PR02CA0070.outlook.office365.com (2a01:111:e400:2c2a::28) with Microsoft SMTP Server (TLS) id 15.1.184.17 via Frontend Transport; Thu, 4 Jun 2015 22:58:13 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.173) smtp.mailfrom=sandisk.com; qlogic.com; dkim=none (message not signed) header.d=none; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.173 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.173; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.173) by BN1AFFO11FD029.mail.protection.outlook.com (10.58.52.184) with Microsoft SMTP Server id 15.1.184.11 via Frontend Transport; Thu, 4 Jun 2015 22:58:12 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep12.sandisk.com (Symantec Messaging Gateway) with SMTP id B7.41.06265.308D0755; Thu, 4 Jun 2015 15:58:11 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.224.2; Thu, 4 Jun 2015 15:58:11 -0700 X-AuditID: ac160a69-f790f6d000001879-01-5570d803efd0 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id C5.75.04661.208D0755; Thu, 4 Jun 2015 15:58:10 -0700 (PDT) Message-ID: <5570D801.5090703@sandisk.com> Date: Thu, 4 Jun 2015 15:58:09 -0700 From: Bart Van Assche User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: James Bottomley CC: Himanshu Madhani , Quinn Tran , Saurav Kashyap , "linux-scsi@vger.kernel.org" Subject: [PATCH 10/10] qla2xxx: Fix indentation References: <5570D656.9050704@sandisk.com> In-Reply-To: <5570D656.9050704@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRmVeSWpSXmKPExsWyRoxnkS7zjYJQg/U/1S1e/HjCavF//W0W i+7rO9gsrt14y2wxf+ZfVgdWj8M/fjB7rPtygt3j8ya5AOYoLpuU1JzMstQifbsEroye2c0s Bb/kKi6/PMLcwDhRsouRk0NCwERiU/cLJghbTOLCvfVsXYxcHEICJxglvjTMZ4ZwtjNKtN5q ZoHp6Lo9CapqN6PEwV397CAJXgEtiY33njOC2CwCKhL/Zi8Ai7MJGEl8ez8TqJmDQ1QgTGLP HlWIckGJkzOfgM0UEdCUuLJ0LtgVzAIHGSV+fUgHsYUF9CUuznzGBNIqBDR+wkFlkDCngLbE 70/nmUHCzECt63fpQ3TKS2x/OwfsZAmBvawSzyZfYgVJCAmoS5xcMp9pAqPILCSbZyG0z0LS voCReRWjWG5mTnFuemqBoZFecWJeSmZxtl5yfu4mRnB0cGXuYFwxyfwQowAHoxIPr8Wx/FAh 1sSy4srcQ4wSHMxKIrxzNxWECvGmJFZWpRblxxeV5qQWH2KU5mBREuftzdUJFRJITyxJzU5N LUgtgskycXBKNTAKs+dIv7yssPV9ltTKwk6H9z/11IIbE7/JOm38GtjowdjzPOaK3ffwiSJO R16m8IltKNuj9YnBuur9qqPZ3+um7DtUlZ4WFMrnHDF3lTiTa5tK/7y4Pxu7V945umHu0q0a nzIZVilvavCw3v/jzJ7HSw2PSz40Wb54bmKtQ7LWxyXxIkVWoeeUWIozEg21mIuKEwGbQWmm igIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsXCtZEjRZfpRkGowZq9+hYvfjxhtfi//jaL Rff1HWwW1268ZbaYP/MvqwOrx+EfP5g91n05we7xeZNcAHMUl01Kak5mWWqRvl0CV0bP7GaW gl9yFZdfHmFuYJwo2cXIySEhYCLRdXsSG4QtJnHh3nogm4tDSGAno8SCObPYQRK8AloSG+89 ZwSxWQRUJW7dPARmswkYSXx7P5Oli5GDQ1QgTGLPHlWIckGJkzOfsIDYIgKaEleWzmUCmcks cJRRYtLyBlaQhLCAvsTFmc+YQHqFgOZPOKgMEuYU0Jb4/ek8M4jNLKAu8WfeJShbXmL72znM Exj5ZyFZMQtJ2SwkZQsYmVcxiuVm5hTnpmcWGBrpFSfmpWQWZ+sl5+duYgQHKWfUDsbrE80P MTJxcEo1MBZkms86+OVSvvGx15O4pQ8dF1gisV7jworA7cvfqcdyPpRKfp/r2b6mJUtOkffj suZ5u+99nL3+RkrO7ikXnYT2HC8Jf/sg6uTjpmeXpB+mZlRke+rwrf7ALHNs+sl8rYWth50L 87aK9zTOmdfDatxk2H74jUnJ9cUMhecbdgasO3ia8/Hc7dlKLMUZiYZazEXFiQA8VI/uAgIA AA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD029; 1:/fknpEpKzjRLuAuW7jDIg/GB+ph/L2cAAAftNqpXH0PoQAPZndP0v20JLSmmQFwPSkJxWSpZRUPepiM+dUfPZndoPgbwTsn8AzV9IHHF7WCDQia3DH5ctUbi9Tfhx7hRPdgjkyiRZ8jQ6yA/HXZ9AC2kr+22hq4VesJvEtGHpzlCFZY/dpz14/5FXe+yFCBGpA45o0LZEy0eJyGuusJMml80fapPLRyU5JTbClXwlgfkmm7zQGeFIm1Jzrv0frHF3SDV9frerGpjF1K5ggPEIJpel8nFmrVaDNzCFZK5OK7egxhWL6olyLtmuqK2Lx0kbXVa/aK60hu+/WRZNQXwyw== X-Forefront-Antispam-Report: CIP:63.163.107.173; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(438002)(189002)(199003)(19580395003)(65806001)(65956001)(4001350100001)(229853001)(47776003)(64126003)(53416004)(86362001)(189998001)(36756003)(87936001)(19580405001)(575784001)(92566002)(83506001)(50466002)(46102003)(110136002)(5001960100002)(106466001)(54356999)(62966003)(50986999)(77096005)(87266999)(2950100001)(23676002)(33656002)(65816999)(77156002)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0201MB1552; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0201MB1552; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:SN1PR0201MB1552; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0201MB1552; X-Forefront-PRVS: 0597911EE1 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2015 22:58:12.2048 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.173]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0201MB1552 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Detected by smatch. Signed-off-by: Bart Van Assche Cc: Himanshu Madhani Cc: Quinn Tran Cc: Saurav Kashyap Acked-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 8 ++++---- drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/scsi/qla2xxx/qla_nx2.c | 13 ++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 33cb3f6..5a5ca43 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -708,7 +708,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha) if (rval != QLA_SUCCESS) { ql_log(ql_log_warn, vha, 0x00d4, "Unable to initialize ISP84XX.\n"); - qla84xx_put_chip(vha); + qla84xx_put_chip(vha); } } diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 21d6f3f..524b5bc 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2763,10 +2763,10 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds) handle = req->current_outstanding_cmd; for (index = 1; index < req->num_outstanding_cmds; index++) { handle++; - if (handle == req->num_outstanding_cmds) - handle = 1; - if (!req->outstanding_cmds[handle]) - break; + if (handle == req->num_outstanding_cmds) + handle = 1; + if (!req->outstanding_cmds[handle]) + break; } if (index == req->num_outstanding_cmds) { diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 79f6989..b70af1f 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1579,7 +1579,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, void *tsk) ql_log(ql_log_warn, fcport->vha, 0x503c, "Async-%s error - hdl=%x response(%x).\n", type, sp->handle, sts->data[3]); - iocb->u.tmf.data = QLA_FUNCTION_FAILED; + iocb->u.tmf.data = QLA_FUNCTION_FAILED; } } @@ -1978,7 +1978,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt, rval = EXT_STATUS_ERR; break; } - bsg_job->reply->reply_payload_rcv_len = 0; + bsg_job->reply->reply_payload_rcv_len = 0; done: /* Return the vendor specific reply to API */ diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index b359a83..bb0ee7c 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -1835,7 +1835,7 @@ qla82xx_set_product_offset(struct qla_hw_data *ha) ptab_desc = qla82xx_get_table_desc(unirom, QLA82XX_URI_DIR_SECT_PRODUCT_TBL); - if (!ptab_desc) + if (!ptab_desc) return -1; entries = cpu_to_le32(ptab_desc->num_entries); diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index b8ceb82..007192d 100644 --- a/drivers/scsi/qla2xxx/qla_nx2.c +++ b/drivers/scsi/qla2xxx/qla_nx2.c @@ -397,11 +397,11 @@ qla8044_idc_lock(struct qla_hw_data *ha) * has the lock, wait for 2secs * and retry */ - ql_dbg(ql_dbg_p3p, vha, 0xb08a, - "%s: IDC lock Recovery by %d " - "failed, Retrying timeout\n", __func__, - ha->portnum); - timeout = 0; + ql_dbg(ql_dbg_p3p, vha, 0xb08a, + "%s: IDC lock Recovery by %d " + "failed, Retrying timeout\n", __func__, + ha->portnum); + timeout = 0; } } msleep(QLA8044_DRV_LOCK_MSLEEP); @@ -3138,8 +3138,7 @@ qla8044_minidump_process_rdmdio(struct scsi_qla_host *vha, goto error; addr7 = addr2 - (4 * stride1); - data = qla8044_ipmdio_rd_reg(vha, addr1, addr3, - mask, addr7); + data = qla8044_ipmdio_rd_reg(vha, addr1, addr3, mask, addr7); if (data == -1) goto error;