From patchwork Thu Aug 2 20:16:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10554155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4AFA157D for ; Thu, 2 Aug 2018 20:17:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B17D42C444 for ; Thu, 2 Aug 2018 20:17:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A55DF2C459; Thu, 2 Aug 2018 20:17:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 779642C444 for ; Thu, 2 Aug 2018 20:17:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbeHBWJt (ORCPT ); Thu, 2 Aug 2018 18:09:49 -0400 Received: from mail-sn1nam01on0084.outbound.protection.outlook.com ([104.47.32.84]:59587 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727111AbeHBWJt (ORCPT ); Thu, 2 Aug 2018 18:09:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bC4Syc/8mUt4OryPbD0RqJihQofIJ8P+hGAUD466+/g=; b=CGoMrBVdSeuMg3yGH/IfNglpFggbQ2CSab7EBcMMnZ1hfqgI1b+X/JJM/sZUVbIeMTHi239UKf9K9bJxi0CZEaKowD8wxU8QVDsRlz1nJtuDWgWaNsLq/o52VnnLvhqIVtIL8RZ+1vHcoFEGdiwuU5S31TxX2rc6Ce68pbTsBm4= Received: from DM5PR07CA0085.namprd07.prod.outlook.com (2603:10b6:4:ae::14) by MW2PR07MB4075.namprd07.prod.outlook.com (2603:10b6:907:7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Thu, 2 Aug 2018 20:17:03 +0000 Received: from BY2NAM05FT006.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::202) by DM5PR07CA0085.outlook.office365.com (2603:10b6:4:ae::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1017.14 via Frontend Transport; Thu, 2 Aug 2018 20:17:02 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2NAM05FT006.mail.protection.outlook.com (10.152.100.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1038.3 via Frontend Transport; Thu, 2 Aug 2018 20:17:02 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Thu, 2 Aug 2018 13:16:59 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w72KGwVA007942; Thu, 2 Aug 2018 13:16:58 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w72KGwFs007941; Thu, 2 Aug 2018 13:16:58 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 01/16] qla2xxx: Cleanup for N2N code Date: Thu, 2 Aug 2018 13:16:43 -0700 Message-ID: <20180802201658.7903-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180802201658.7903-1-himanshu.madhani@cavium.com> References: <20180802201658.7903-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(136003)(376002)(346002)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(316002)(5660300001)(50466002)(69596002)(110136005)(54906003)(81156014)(486006)(48376002)(81166006)(305945005)(2906002)(8676002)(106002)(80596001)(76176011)(51416003)(126002)(1076002)(2616005)(186003)(44832011)(16586007)(8936002)(476003)(26005)(356003)(42186006)(446003)(336012)(11346002)(50226002)(4326008)(72206003)(36756003)(86362001)(87636003)(478600001)(47776003)(6666003)(106466001)(575784001);DIR:OUT;SFP:1101;SCL:1;SRVR:MW2PR07MB4075;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;BY2NAM05FT006;1:RiwL5nRU1PooCiIU4rrKKz442SNdMyHOPdp2YE8duHH1ZCITF1MvHmzapOttD+DfH7B5p7dQLoKImyTlkqDjFxuHbBY9e+OnaJlmaQ7xHW5puwZoWIO0Gbwt5oSsKp8R X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c286d6f7-a6ab-4431-7a53-08d5f8b4e8cd X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:MW2PR07MB4075; X-Microsoft-Exchange-Diagnostics: 1;MW2PR07MB4075;3:lp5Lut4FzZ1DKoy7PkGkT4G7F3JlsYwBEy2yYGGzpfOkZjAHflxtox2ne9QMsS1TR0f7KZaQ5mLFdOrsRBiua2JqgCBWe8rIfUCNjEaqrNADkHKO8mhhe6RPH2MMPi6dW/Sz3je9u6iEA9czIdhXgXcVj0JzAZEPpFjJnz86wYmwVTrxrfXyoyoZo8M/93wUayfKpcZPJTW2/mga32xCHqx+cK/A5ae0jtGd0DzYrvv1bedWJFfN15QrUzx11BaI+OU1OT/QTm9yfl+iKXMvMNfkkAFfBwVaUqLrlO6iUS21a+20iIaezuy78fThDpKYkc2ARu0m3VgVmLirur4eRgMqUZqyGqQbrRsemt2BTyA=;25:NmR7XBpDy/r3TPmieCVjHPuFZmB5V3OaJwVPXvbkNplyadIKL6VWjEGmyLmktKOW6pwQZA/zFLHqRUIq8cMP4ykn2UTJAR4lA9MrvY2nNP4IMnhoy8LT3XAr/gvvdTtMfAGNg9Y+Ioao7O1eCPGWl/bdN5OGbA41rtlGeYhzX3MPh+f5kRUxlaq+eRpaXvTY8bIA4u9fo43PTBXIO3g/u6ovQ64pt4DJgPONJ3vSFYQNdMqRpfdAOKZ8GSO9mYWHOmqxGuap+LNQpCWY21Zu3gKMOREWW7b293CBWaTAjer/n8ly7ZQgMFLtVrcItPhigZdJh5DWh8q913XlNK4CwA== X-MS-TrafficTypeDiagnostic: MW2PR07MB4075: X-Microsoft-Exchange-Diagnostics: 1;MW2PR07MB4075;31:duyJAV5pM1ykVhXh+E9UEIyFTJDbmlrnWU+Afockz3EhoEKNBguBkBKgaZtnHWOxMrYZfxv52pgHUl17s/Tc1+PEaG63K9pd+fwQFbLjbzlgYkxCEYQPVVuCj3BdoEsseuDOXi6yLER3b1ifi38fd9rt8cYZFXmJ3J6qAgYbRemGX4Fx9mQwJLBFF920z68tQwLXCP/zVFhEjdFLZ36RaU7MBGOlM3+3M05rUYZgcqk=;20:zXnWiJZq5n0PmWCFxxoFDWeXCjjvvs48yEVQlkburqWo5al7cWfHsDyr1GHgbMZ8SrBSp+fg+PSrLrpgfNS0tvNfZt5FcM51guaopVX3oK6wHxlP7b9tHDiGjOeM2MuGjosAnNbR2cTOMmiNEKQtrdCbm71VoKjB3wJvG7Y0p1AGZkbdJZeQAjjp66Ov0IhfW1DoIlYpd2zUB8/P22OWVoyYCB7Pr6PBy0BzRAbwIwgAkMoVMg+Q0LR0YPg3oAPC5Z545RqqKMajKDAZwWJh4ohmL4xDSvWxpzWbDEe0A2gEuplxaQkf7KSjGHpN2gDe3MNs/Zv0v1TLRPxD+Qd5pPJDzkeRockmDCdtQbunE6plGsWIOIsfkhz7J3wAYRCl03Rxh4LCgN5mTMYqWGE9Gex1V7hZHU6x6lMtiLyngyRkDiM5hLqr7SkKKWGspa8bGmTCqfSTHn19/XAyIVhymOMa7qjLxCE+DS4IggN/PJ8qJwRQof4X3o2LKttK/EMr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93004095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011)(7699016);SRVR:MW2PR07MB4075;BCL:0;PCL:0;RULEID:;SRVR:MW2PR07MB4075; X-Microsoft-Exchange-Diagnostics: 1;MW2PR07MB4075;4:ENDHJyyMBOT21lgjv+CAr4pDFKO3BbAbB1fL4tZITq9Oh3nOt/tDnalxz5VcMlelacTOzJJmcm7x1WmEhYMXEqKxFb5x0RPN5pDJdQm5ZcLtB/TXl3MGS54MfQxzJRw9vc0HGJnZtwDKNYwTWOY1YOXEPC+ZcytqZrufJvdj2u/PUPaT+PmNcbQC96toTAtmPOO0dLhFw73wHrvlK8gTyD/zQc6A8A//ig5If+fjdjfG/Si8j8px0uD4GRxpTZCmdv5qlb+HzYuVjF3NsKqKYQ== X-Forefront-PRVS: 07521929C1 X-Microsoft-Exchange-Diagnostics: 1;MW2PR07MB4075;23:1Hopb8dJCO0CM37ss2kMp0MGTM2Osk0niKLvkx7MNH0nSSU99dPFGCnmEDK2B6gJcREAgo/27lobkgOsKt+DK3TRCUZi1wj/86SnDxf4I5BwXcKvQP+P+SUA139ordL4g9u23muLLnKDeRTfq06hzTgqhhMIghZnny7Yba0ubIV9eLvixR8WH5b+zhrHfyOk1TaTIkkdOXt5HD4cjErJ9ywpEPt9dF72s3Sp4PL4FColrGmqFULwjpOupDzpt8D23xGPMC9qm1u9LsOJNMyetHXZbmZhgxGPdSdUmf2tuHsAom5HZSwWrmey+eCVy/JJcz9fNK3gSu4seMLaScWYhsiO0V6nfMs3q5Gg2/duMSELSqEBFJMcZNOZeP68cMw8IG/voYu25n4FOp/UKuSocA1hpQuPaSLjhJjM2V+G0T5UoqADoc3A0+opdVpXXXdJubHVesB2yg9+a3OHsiIdmS54pgI/VgNnJKnbxIXnzNOYd+jC7ahxunmk7/dlmq81K/UiK4j03jJOji7RUt6JD1MCsTvkXIVmOiiBDesiq5VBqTLjFmrRZ50/rG9aXGR2k2ZOdb4K49NDEj2s0nLczW7zIGkoQMVyNcymv/nnwc9tBgZoyw21+CdXBymWIXbHr9D0bmVffg6XhwFmXxESHSlPu8k0LohVikRsFPKyqZ9JVzNqRXiJpmGesRM0VDtm2dov7Euw4YwxitFCpvpbCk0xkO82rzvK1uIR6gg2Ow38mbV9j3O6Ylg4xX+zpa+ptj5gIaroPoFNebMBVZsu6rDkK0OJTl8f4eKOWOz6EnNC+2+W38waOv1/wAP/qbVmGBNe72A+xa4/GXyb3JF2E4J/cjvjMpcyWQGNdQoFH+1AQ9jwyX1wdZ18TWTzrv0iF3So6SQ4zMrPuPdcdZfy1Po2APp11mC/lyd+ciZTkPrGsRTaJl2uVsPzKlCfFqKWuczrZ6DzNPskvmEm8bOD0umtLdUrwk5UM9eOIRRelfi3qheHViGCq/5ZTOGGTeFaso/jQwb3lMxlBOby8wTBan4RwD5pDFAAcWhi8hCWYR6MDilftgsnkpK6LmCje7HciytNS8YNoZczafcGV8Bleskwpx/xMmbecRRBho6wOWIp3xpP5xEYht3/eEU4+L0x X-Microsoft-Antispam-Message-Info: uMdK7CtkwVGuDsbcew5Q3AYr6mMXQnwZ++3lJ2ABih/T6bscZnJxG2W+Ym/Sz1C0vJdGuD+Ok4t6Kh82al3nRgg3/7rLFxwO9u+miVWu322dH/TTy9rqaIFJ3/Z0hSoYYQy5p7duTfopPmibPXc+yRQoHSxHZfmQgT3CNDN8o+CLhKOzMJAKDffRLdNMSlwvcprnWwxQaKZNU6tpE9mZf9OTqd+WfK1URXUwDcohTUiI2tnOQRpf+rAyedKrSGFW1zh4sCFpnk5pzqQPesA3+FgyIcmSlUhQULHUR9pokVcznbv5qAe2wV4zz+gp/RmJyPLqGIDTszKakaFiBxgBqDXxzLQh1wwbrVsmIV548YY= X-Microsoft-Exchange-Diagnostics: 1;MW2PR07MB4075;6:0WWnNOVVPlFRL+Bn29M5ff1aYv9FiTpCgZLm/tCeR7fnjMc0FiU2JsdV6oILwipGtdpbP92PQGgKu4fcsr4LW3Rwr3THGUHxbSGIYK74VzBSFbVFMHIaeicTAxTz+C+QyS26lmjDwW4+C4gXM5VvSRryxbLg0QtKYccqDkkTfCpo1Riqf33w1c9lAYl1eYP8CmFW0r68hubo91E/VTs0+I4qwLCJePIWICF2AdDYRqaYDIZqvg1jX3BkXW0MbQXVVIcbuYfDe1HE1Kho9ZCPxIJMnKFUlikm+QmVNc6ef0rmY68ggiWmO+T+Utj7Ev297BJlKfR2rCxywHMuJZCsxO94r+MbJQ8gF0F8uzmt8LAhOwNhy6kzOAqTjcnOZCvG6123Kdp0mqgjkkFdhs0FvFhYhk7bijru7D7HMyu3B7RLEDjrDPmBkAS3lMCnbKwlIRw19vu0Y16DGx4C4XmkRA==;5:Jqce7xvFidXGsDclc1Z1jPUGT8RUylcY1BbwDWBYpzLLkqU9MuQIjA5aYcB1Wr9qL2eQt/FESFD/xdCQW4SrGZV2t6t899NuSQTKFAlNe9ZyDvKiUNAa1vHHaHwtxPhD9vfS9LCmK/M/ItcV9luWyBYw29HwUCvDlIPLuwJhOqk=;7:1HH0+DiVJSf0md/Z60Becl17v4Ipy96l4iUX+AWpYYiWMAnZfqe0om/FzVNqFLVk3kMmlVhmIX3u7bWv+IQO7nGIbQ05Zx4hDz4fWv/NNQ+SApTDc6bnuNgFWTdt6i6gUQLNb7p6fNN7YJL3qvRxAJSdixK2i3rigFFjXf4jvkdxrZUBmKJfnqQg53ZnIyq2iVMF4ybecmYJ95/4gEDjtc+8I9MqO8S6OWQCQKk8XuBf6xMoyxcDpCoBVl6VNT6W SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2018 20:17:02.4343 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c286d6f7-a6ab-4431-7a53-08d5f8b4e8cd X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194;Ip=[50.232.66.26];Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR07MB4075 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 112 ---------------------------------------- drivers/scsi/qla2xxx/qla_iocb.c | 25 --------- 2 files changed, 137 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 7b675243bd16..1de78697dc0d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4687,110 +4687,6 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) } /* - * N2N Login - * Updates Fibre Channel Device Database with local loop devices. - * - * Input: - * ha = adapter block pointer. - * - * Returns: - */ -static int qla24xx_n2n_handle_login(struct scsi_qla_host *vha, - fc_port_t *fcport) -{ - struct qla_hw_data *ha = vha->hw; - int res = QLA_SUCCESS, rval; - int greater_wwpn = 0; - int logged_in = 0; - - if (ha->current_topology != ISP_CFG_N) - return res; - - if (wwn_to_u64(vha->port_name) > - wwn_to_u64(vha->n2n_port_name)) { - ql_dbg(ql_dbg_disc, vha, 0x2002, - "HBA WWPN is greater %llx > target %llx\n", - wwn_to_u64(vha->port_name), - wwn_to_u64(vha->n2n_port_name)); - greater_wwpn = 1; - fcport->d_id.b24 = vha->n2n_id; - } - - fcport->loop_id = vha->loop_id; - fcport->fc4f_nvme = 0; - fcport->query = 1; - - ql_dbg(ql_dbg_disc, vha, 0x4001, - "Initiate N2N login handler: HBA port_id=%06x loopid=%d\n", - fcport->d_id.b24, vha->loop_id); - - /* Fill in member data. */ - if (!greater_wwpn) { - rval = qla2x00_get_port_database(vha, fcport, 0); - ql_dbg(ql_dbg_disc, vha, 0x1051, - "Remote login-state (%x/%x) port_id=%06x loop_id=%x, rval=%d\n", - fcport->current_login_state, fcport->last_login_state, - fcport->d_id.b24, fcport->loop_id, rval); - - if (((fcport->current_login_state & 0xf) == 0x4) || - ((fcport->current_login_state & 0xf) == 0x6)) - logged_in = 1; - } - - if (logged_in || greater_wwpn) { - if (!vha->nvme_local_port && vha->flags.nvme_enabled) - qla_nvme_register_hba(vha); - - /* Set connected N_Port d_id */ - if (vha->flags.nvme_enabled) - fcport->fc4f_nvme = 1; - - fcport->scan_state = QLA_FCPORT_FOUND; - fcport->fw_login_state = DSC_LS_PORT_UNAVAIL; - fcport->disc_state = DSC_GNL; - fcport->n2n_flag = 1; - fcport->flags = 3; - vha->hw->flags.gpsc_supported = 0; - - if (greater_wwpn) { - ql_dbg(ql_dbg_disc, vha, 0x20e5, - "%s %d PLOGI ELS %8phC\n", - __func__, __LINE__, fcport->port_name); - - res = qla24xx_els_dcmd2_iocb(vha, ELS_DCMD_PLOGI, - fcport, fcport->d_id); - } - - if (res != QLA_SUCCESS) { - ql_log(ql_log_info, vha, 0xd04d, - "PLOGI Failed: portid=%06x - retrying\n", - fcport->d_id.b24); - res = QLA_SUCCESS; - } else { - /* State 0x6 means FCP PRLI complete */ - if ((fcport->current_login_state & 0xf) == 0x6) { - ql_dbg(ql_dbg_disc, vha, 0x2118, - "%s %d %8phC post GPDB work\n", - __func__, __LINE__, fcport->port_name); - fcport->chip_reset = - vha->hw->base_qpair->chip_reset; - qla24xx_post_gpdb_work(vha, fcport, 0); - } else { - ql_dbg(ql_dbg_disc, vha, 0x2118, - "%s %d %8phC post NVMe PRLI\n", - __func__, __LINE__, fcport->port_name); - qla24xx_post_prli_work(vha, fcport); - } - } - } else { - /* Wait for next database change */ - set_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags); - } - - return res; -} - -/* * qla2x00_configure_local_loop * Updates Fibre Channel Device Database with local loop devices. * @@ -4847,14 +4743,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) } new_fcport->flags &= ~FCF_FABRIC_DEVICE; - /* Inititae N2N login. */ - if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) { - rval = qla24xx_n2n_handle_login(vha, new_fcport); - if (rval != QLA_SUCCESS) - goto cleanup_allocation; - return QLA_SUCCESS; - } - /* Add devices to port list. */ id_iter = (char *)ha->gid_list; for (index = 0; index < entries; index++) { diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index a91cca52b5d5..b349e9b94c08 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2568,26 +2568,6 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) } static void -qla2x00_els_dcmd2_sp_free(void *data) -{ - srb_t *sp = data; - struct srb_iocb *elsio = &sp->u.iocb_cmd; - - if (elsio->u.els_plogi.els_plogi_pyld) - dma_free_coherent(&sp->vha->hw->pdev->dev, DMA_POOL_SIZE, - elsio->u.els_plogi.els_plogi_pyld, - elsio->u.els_plogi.els_plogi_pyld_dma); - - if (elsio->u.els_plogi.els_resp_pyld) - dma_free_coherent(&sp->vha->hw->pdev->dev, DMA_POOL_SIZE, - elsio->u.els_plogi.els_resp_pyld, - elsio->u.els_plogi.els_resp_pyld_dma); - - del_timer(&elsio->timer); - qla2x00_rel_sp(sp); -} - -static void qla2x00_els_dcmd2_iocb_timeout(void *data) { srb_t *sp = data; @@ -2648,10 +2628,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, } elsio = &sp->u.iocb_cmd; - fcport->d_id.b.domain = remote_did.b.domain; - fcport->d_id.b.area = remote_did.b.area; - fcport->d_id.b.al_pa = remote_did.b.al_pa; - ql_dbg(ql_dbg_io, vha, 0x3073, "Enter: PLOGI portid=%06x\n", fcport->d_id.b24); @@ -2664,7 +2640,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, qla2x00_init_timer(sp, ELS_DCMD_TIMEOUT); sp->done = qla2x00_els_dcmd2_sp_done; - sp->free = qla2x00_els_dcmd2_sp_free; ptr = elsio->u.els_plogi.els_plogi_pyld = dma_alloc_coherent(&ha->pdev->dev, DMA_POOL_SIZE,