From patchwork Thu Jul 9 14:25:25 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: 6756481 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7131B9F380 for ; Thu, 9 Jul 2015 14:25:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81036206A5 for ; Thu, 9 Jul 2015 14:25:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E351205EE for ; Thu, 9 Jul 2015 14:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751723AbbGIOZc (ORCPT ); Thu, 9 Jul 2015 10:25:32 -0400 Received: from mail-bn1bon0067.outbound.protection.outlook.com ([157.56.111.67]:38640 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751298AbbGIOZa (ORCPT ); Thu, 9 Jul 2015 10:25:30 -0400 Received: from BN1PR02CA0049.namprd02.prod.outlook.com (10.141.56.49) by CY1PR02MB1368.namprd02.prod.outlook.com (10.161.171.141) with Microsoft SMTP Server (TLS) id 15.1.207.19; Thu, 9 Jul 2015 14:25:28 +0000 Received: from BN1BFFO11FD054.protection.gbl (2a01:111:f400:7c10::1:169) by BN1PR02CA0049.outlook.office365.com (2a01:111:e400:2a::49) with Microsoft SMTP Server (TLS) id 15.1.213.14 via Frontend Transport; Thu, 9 Jul 2015 14:25:28 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.172) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.172 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.172; helo=milsmgep11.sandisk.com; Received: from milsmgep11.sandisk.com (63.163.107.172) by BN1BFFO11FD054.mail.protection.outlook.com (10.58.145.9) with Microsoft SMTP Server id 15.1.190.9 via Frontend Transport; Thu, 9 Jul 2015 14:25:26 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep11.sandisk.com (Symantec Messaging Gateway) with SMTP id BC.BA.04667.6548E955; Thu, 9 Jul 2015 07:25:26 -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, 9 Jul 2015 07:25:25 -0700 X-AuditID: ac160a68-f790b6d00000123b-96-559e8456fa19 Received: from [10.50.231.57] ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id C0.5D.04661.5548E955; Thu, 9 Jul 2015 07:25:25 -0700 (PDT) Message-ID: <559E8455.80706@sandisk.com> Date: Thu, 9 Jul 2015 07:25:25 -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 v3 09/10] qla2xxx: Remove dead code References: <559E8382.6030803@sandisk.com> In-Reply-To: <559E8382.6030803@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCLMWRmVeSWpSXmKPExsWyRoxnkW5Yy7xQg74WEYsXP56wWvxff5vF ovv6DjaLazfeMlvMn/mX1YHV4/CPH8we676cYPf4vEkugDmKyyYlNSezLLVI3y6BK2PDvy62 gh+cFW9mhzUwTufoYuTkkBAwkejdd4QdwhaTuHBvPVsXIxeHkMAJRolbM6exgCSEBLYzSuzZ HgfTcH/DX1aI+GZGifmz6kFsXgENiSMzTjOB2CwCKhIPHzWA2WwCRhLf3s8EmsPBISoQJrFn jypEuaDEyZlPwMaLCGhKXFk6F6ycWeAgo8SvD+kg5cICxhL35xlCbNKSODZxJlg5p4C2xJvJ i9hASpiBWtfv0ofolJfY/nYOM8j1EgJ7WSWubpnMCNGrLnFyyXymCYwis5BsnoXQPgtJ+wJG 5lWMYrmZOcW56akFhoZ6xYl5KZnF2XrJ+bmbGMFxwZWxg3HrJPNDjAIcjEo8vA0754YKsSaW FVfmHmKU4GBWEuE93zwvVIg3JbGyKrUoP76oNCe1+BCjNAeLkjhvb65OqJBAemJJanZqakFq EUyWiYNTqoGxzWHfI9Y9TqE/ot0yok6ZPNj03/nvS61lfHZiugrCF6PqrVLL6iZdPPj97TKJ vk31POwFTZ+NeMX1/SslnswUOdBopj3PZmLO4nppT/VVjmrfggqDNnn8vjX136xjQguUXgnU vFA0XZr0ZaXgkxq9pSvSvX4lxBvFCct8/xk/o9zTqt9kpqwSS3FGoqEWc1FxIgC13uiehwIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHJMWRmVeSWpSXmKPExsXCtZEjRTe0ZV6owbNZ1hYvfjxhtfi//jaL Rff1HWwW1268ZbaYP/MvqwOrx+EfP5g91n05we7xeZNcAHMUl01Kak5mWWqRvl0CV8aGf11s BT84K97MDmtgnM7RxcjJISFgInF/w19WCFtM4sK99WxdjFwcQgIbGSUmr+wAS/AKaEgcmXGa CcRmEVCVeLn8KAuIzSZgJPHt/Uwgm4NDVCBMYs8eVYhyQYmTM5+AlYgIaEpcWTqXCWQms8BR RolJyxtYQeqFBYwl7s8zBKkREtCSODZxJlg9p4C2xJvJi9hAbGYBdYk/8y4xQ9jyEtvfzmGe wMg/C8mKWUjKZiEpW8DIvIpRLDczpzg3PbPA0EivODEvJbM4Wy85P3cTIzhEOaN2MF6faH6I kYmDU6qBMXX12kUrGZZuftW+wjy9ReZxZ1yV0nmmnn8BqZ+z11dMmqw7t6zst2fHr+WXdAS9 f/d0reM5fWzbrY3TfD6ufasm0pf2ROwk7/qJq//kHTx0ZOq6Kbt4tl25rmd555L9/+Z7rboT BEsl0q/mdkSENF77opD77/Xndfdjl33riP0+0UzvEMsepT9KLMUZiYZazEXFiQAKhj69AQIA AA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD054; 1:qmgKPn0PIMPbd6h9J9jEmZyrMzz1JN6BZnihUbm/PXr2UrKp1GT4p7rf0dyIw3DFIQLMmmTLTERtVU225XN3KngBRvxXTA0Zg1PIAB/gXaB+QNPRi8TRKyeIC6kJYiTNfPpZzbplGNe4yZRXqstL4sgkGBU3KO7G/was11W4JH9xyTrhXIWm4fi8ABE0m9AC4S1D1L+uibjNxu45pJKRI9hWBsgvR158G4KKjW+XarA/qvihnAKNkgaHJQs2CFZEMkREaxDbQdlgZXoBeIn/TXf0XhgNi/50bIxawAQ33zP+KUfNhAwSUbRXtvlA2ZhD X-Forefront-Antispam-Report: CIP:63.163.107.172; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(54356999)(76176999)(50986999)(92566002)(229853001)(23676002)(106466001)(64126003)(50466002)(36756003)(4001350100001)(77096005)(19580395003)(19580405001)(2950100001)(86362001)(575784001)(62966003)(46102003)(77156002)(87936001)(83506001)(110136002)(189998001)(5001960100002)(33656002)(65816999)(65956001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1368; H:milsmgep11.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1368; 2:3pRAZ2lw2W6n25HJLKOBGFF9ep0T0euVVZrb38sqCZxEK89H5DaeCSa1tQ1wVvu2; 3:19pvZS/qeNUeUFrRb99BMSXHkVTJyF040O2DafZhHtD01qlPfDfsvEz3fgo9Vr3HNl4fTIeySMWiqKpQowa/eWCgx9Uvyynyl6EFuijED5r/L12ccQVQJ58jcSp85yXnELuj00g6Qm0vORU1w4jDJnsVa0cmkZt3zqKEjXi7r6Sb8JVD6SFYbRNvJw/gDg2Cx76reJrqbnUVU3PllgcA20lZn16ZCB6062vSVDbX3uaTA4ebvcmoRroBcJi5CSxW; 25:LieKG80wqGETPiECx76yrtVJyfpArKxSD4BOMFezEIGOdvIXnqsWhFjC26fo0hhcmVl4Nf9Zk9hQZ4w8b3jB+6/6ynkkHX8b7F2ms0W3uNgjNjFQO2HQ8w+DMRXV67ssH3ZodjfJ90PFMjKJgToYB700s5c4CqUiTvJcr9AroT1bgCNYQDDmtN4trpwufNQmHkywJIW/uZV1qu6w9jCnYw3lAlFSbsdBUxBmkKE5dxEzBQUcxapYsgHEQuiyqmugMyI0xwqkWujQ1B4wBde8mw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR02MB1368; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1368; 20:IGyd1RULGd+6C1y1N7//+qoN12VkKMMfY7/rxXhZuWtqXV8oDxj6fCZQev+5R+r0aTPS9MAQxnzZw3h+20V7VD+8V3peNeWZkunvjJUzX0jkYPlC8r4yionYcbfqGGrMbFQy+J8BEO/qdhlSg0coacVvFnn8u6LBSkKZl/DDeDxOWIdLYPq3db3U53AckbJW3D0xQtN8koIzD8iTd6+PsPEoDgyXlyYCn/aUKoSUTK2ipPNmoXvJ8pyAN4rk2OH/yIdJkTuaS71QHAcgJ59mGheC/htP/T7HthH+963yzlbWE1GI2uIJQLazWGH+KEiq4otVXzXMt7vLobAHXja6PA7XIGUaKnp3CZcq9EuGM3I6pGJ2l1q++Pzld+4gJaBZn/wlSLBD7CqmTTR0lGTnsgLue/k/MXUPQgfx0L9KCS1yXm5YA3YHyMzWGI4FRk/lVTzIO1OV8fTEwXSxmBToZGfX1ucw9X+Ey3p5t2dUJL2raAuvRJ0cAHaSXsV9r/JX; 4:pMwZw7/UiBdRpbzYefclPo7gTrfxoe704oE4qMrlrsZRTJPvEm5eHxQaK6MuuTkbjorSxbe3H2qmgN8/tXJly+3E46jlvqj5+WDjBiQo+Q1iKW34Z/W0M//M0fPiWXzFfgYORr8RKjWBU+lusXEi+KzHwb7rV/SrVPKV0EKvYcyR258bAmT5xTv1BY9wV+K/joxe/zM/vWcbV3on7a3CA1pK/gGizBk8/BLDzNHeFPiVa6TQg4cMArvoIkUIFrOsU7mJLVdtK8IwpkfeEA/53MbYi3tuYHIPRZ25sHJPTGQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR02MB1368; BCL:0; PCL:0; RULEID:; SRVR:CY1PR02MB1368; X-Forefront-PRVS: 0632519F33 X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1368; 23:reFRxBUbSzxVw+6neiEqBFH3YvOlsJcUQTJMaEAsArZ/Q1EyDJYYIPU/hDPK0JgeqBqlQT5W7hKecJ/q+T3sEobjKpOl8XkIF3pHD35i9IUvrj5P5bIZu6goZqamOjyaAGNJVnXoMqwdXRK6oivkbb0iCd0f4rvlJ4MCnxgNL6LIc0TrgPOkrCOLhDSnxzFaPaYm++t3FXNA+ElHw/QUAikyUzmYXqzIOSJ9NeueMFphvifi+nGn28xegFjmNON6mniXBT/ZxKlxrV6VI7U3ekLqDju630cQ55xrXz87s0P9mOg7bNdCH7ql07Zm15rhoNzZytPBp9GzyJIHQKtZhzOLZciKoXclCsQgnFKjbxwEso7c6C4ngnhTzjxu59UWTaLqu+wCQZexwoihenii3QQi1AE4IY8rvb9ESC+TsxMncfypR9INsVgHsjrtcdQq3wZ4WboRganYWoLMSQ0rPJrw3jPcCent/aBFDlbtP0acPdFv0O70FuA+FOdm38t10u4CBdEe6lkxfD8FLU4JuPDntlQwiSl3N4D+DMQXJwLBIeI7Nj6CFFWHnQP15TPpH9IRL97f/WvkSjGOhEMZsnw1RFUwhBNwNymgjedZfLJk+iAAv20v3qJfpJJvHUasBP3SZuQMVfSUqB4C9+BabsDWRpPsWYjoPhJAd2BFTc1GkeMWEUwpwXQ0s5MKXD3ODUchrVhMtzjAqnT+H53YsuQOZmBTvKu13L7w8l0DbuOF5zBfYbHPLoQxv/E6/P9e/rNIEAYSsC4F0X9J9q75CYwugq/86DvyXlQfjqKSYe4UIHPA+ZGp9UPJFhPUSKdmsSE1Gb0H6JR/UGGEWr+qoQ70ghXO9zhTaQxx6VAf3SURH5suDxJiBaFCv8Ibtvf8 X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1368; 5:HwBTY9iuRq84R6GlOcKWL7hZd0zjVLKLR6Z1LRNIbsneCr8Iwk2QFmHEGAcCcqSu3BAlio66+FElwMmOFU/rGXq1NRAItbpBJVWAd03hwo6gNQ5f1xFmxfrHzpcF6EGuc+dYKZSHJVk5AMLo7dMKlg==; 24:3UY4xBkKoVGrb37OloWVGV2kCuK3QulL/zaCfyiFmY9UsNLFRiVl9jwscxOCh6kWHj1L8rMXhltBZ3HyuffVJ3FF32QoOEFQ6tozSRaF9eI=; 20:xAZG/TvDUmJLNp906vmqzsTIwECdHWvhkCwwFvJc8ylYlRhsJMirPCZ9XcbguGd63/egA1QQfR7V/yWaAajeV8kVPzzdcC17llQHUnldUrv2dBFZlQ2+p8spGqdEX0KGKqltD83KMTyGO+pwG5Zrbm4E0/1+HaPtdgmUgMA7FOI= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2015 14:25:26.8285 (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.172]; Helo=[milsmgep11.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1368 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The "return QLA_SUCCESS" statement just above the "fw_load_failed" label cannot be reached, hence remove it. Additionally remove the "else" keyword since the code block below the if-statement ends with a return statement. Signed-off-by: Bart Van Assche Acked-by: Himanshu Madhani Cc: Quinn Tran Cc: Saurav Kashyap --- drivers/scsi/qla2xxx/qla_nx.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 3d3ea84..bb0ee7c 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2473,14 +2473,12 @@ try_blob_fw: ql_log(ql_log_info, vha, 0x00a5, "Firmware loaded successfully from binary blob.\n"); return QLA_SUCCESS; - } else { - ql_log(ql_log_fatal, vha, 0x00a6, - "Firmware load failed for binary blob.\n"); - blob->fw = NULL; - blob = NULL; - goto fw_load_failed; } - return QLA_SUCCESS; + + ql_log(ql_log_fatal, vha, 0x00a6, + "Firmware load failed for binary blob.\n"); + blob->fw = NULL; + blob = NULL; fw_load_failed: return QLA_FUNCTION_FAILED;