From patchwork Wed Jul 25 17:01:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10544447 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 B1CA2112E for ; Wed, 25 Jul 2018 17:01:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EFBD2A83D for ; Wed, 25 Jul 2018 17:01:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 939AD2A872; Wed, 25 Jul 2018 17:01:30 +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 D69F12A83D for ; Wed, 25 Jul 2018 17:01:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729428AbeGYSOB (ORCPT ); Wed, 25 Jul 2018 14:14:01 -0400 Received: from mail-sn1nam02on0088.outbound.protection.outlook.com ([104.47.36.88]:2067 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728557AbeGYSOB (ORCPT ); Wed, 25 Jul 2018 14:14:01 -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=vpR+ZPVIY3jhsWai2nLPw4/KldpJg082zKHpqbYEO/Q=; b=Sfg7rkrWwsSHACjt+sU7AnK5QDjYrH57PoEEtSwdMb48MVAx+SVufSYu05zCHJIwiLaNEcQtF26E7caUSZhpG//AKd6KQq/SRbOwfTligcvHAr88U8N8ounhEbE7WbVTdAMR786mj/MejdRmxjLf5m6ZG2DxP5zwvF6tcR7ELqU= Received: from DM5PR07CA0030.namprd07.prod.outlook.com (2603:10b6:3:16::16) by DM2PR07MB1465.namprd07.prod.outlook.com (2a01:111:e400:50c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Wed, 25 Jul 2018 17:01:25 +0000 Received: from DM3NAM05FT022.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::205) by DM5PR07CA0030.outlook.office365.com (2603:10b6:3:16::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.973.16 via Frontend Transport; Wed, 25 Jul 2018 17:01:25 +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 DM3NAM05FT022.mail.protection.outlook.com (10.152.98.132) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1017.0 via Frontend Transport; Wed, 25 Jul 2018 17:01:24 +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; Wed, 25 Jul 2018 10:01:20 -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 w6PH1KX8010308; Wed, 25 Jul 2018 10:01:20 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w6PH1Kp0010307; Wed, 25 Jul 2018 10:01:20 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 01/16] qla2xxx: Cleanup for N2N code Date: Wed, 25 Jul 2018 10:01:05 -0700 Message-ID: <20180725170120.10269-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180725170120.10269-1-himanshu.madhani@cavium.com> References: <20180725170120.10269-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)(39860400002)(396003)(346002)(376002)(136003)(2980300002)(438002)(199004)(189003)(186003)(72206003)(54906003)(86362001)(2906002)(110136005)(50466002)(16586007)(8936002)(48376002)(81156014)(1076002)(106466001)(106002)(51416003)(8676002)(76176011)(81166006)(87636003)(26005)(36756003)(50226002)(42186006)(6666003)(316002)(336012)(5660300001)(44832011)(69596002)(476003)(47776003)(2616005)(126002)(486006)(4326008)(478600001)(305945005)(356003)(80596001)(11346002)(446003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1465;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;DM3NAM05FT022;1:IxrXwmJu30T+bRBLqzDjewji0Tob2votZfAJ5bbhRIuK3ZWW0LWANqfvfOK0SbmU3sjHMY/ySBGWZE4OWYl/vwBSmDSjvnok8s+h+c6k9eqI0ndIMl7NmDIvjBCL+ayp X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48326711-c1d4-4e8d-0ef6-08d5f250414d X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600073)(711020)(4608076)(2017052603328)(7153060);SRVR:DM2PR07MB1465; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1465;3:bWa1G2xQM3pCbsE1OFEsEe+FIiONOa3DHnksdNRAswgBTz9TgsgikSOME/eBHyG74In9FhPHi5OR456r9hvFpT1vWf1AkuqfiZdF3YoKQoWK7sotVPPJrvG04/9/4kQfOqV2Cj6LeBtRRzCNlVdA+OnyM0asqKLt3qaZGA6Wk9TTzb5Fjgd5phNyE4zmA8u8td1a0h6sJfOfBnBzyY1J94oqTD+vf35BnOguVO2GSfOJ9klwk7t4Lv7zGWzK+dZVdH79hHS73e8P/CJN9ceJs2ZutK/AOcdSjGJ8/NnmhR7lfvR33bjJimF3tlMNTyJfX6HGji6ymg6eQcZAJw1ezXoTSmtjpScLBVSTDmaX1M4=;25:uLejzF0L4AzDavOqTUc5kr7lHzpH44EUCQjXR6Gsq1znZu64XavA8b+3h8mJxmDNczl8WZ4lKIfWHTurbAFXaixUAWlfiaHG/lyH4MZ58AV43X9gmyEZnVV/LOEOaCBjt1smjoiGCV14ziw2EVK3OpTZIIwKMWwlYTc4uw+lyW8wY2g3mFW0czjEwfvqeyshrbre1Fl7rYGpNr0507hCma2mZFuRAB1N8bZL7gKh20FlH1b0RaRaGoBWLv3EwEt7rtRp6X3KTZpdZ8/y0XEI1AGnJuqVmAbIq0rMy4Vcs2mjDJNnJa6r2ZlmS4aFW0uHEDmGonugz2IDfiq7OC8r0w== X-MS-TrafficTypeDiagnostic: DM2PR07MB1465: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1465;31:0PTui1hQ+pKMIpmu+uG92GWQaCd84bKdZYQuu1GQtezRAXvG6gc/KKmcAvy7ntnFKrimaPiXMMBjQf6UtxR3z4/kN3kvuXQRCp6cRwG2snGmlwnx3nre+W4fgqyD0YWWKXfhG9Qt1kOg3BJ0ED1V0sVHS/t5ehbmHG9TC5TecEUDXGM3f44kiw2KsAkVJ3EPxw47cIrDUn9+2UDYR4/B8yI4gHMVmRpu1hvBhtEV+gg=;20:CFzqOqWM1M7IzZtVV9sIxn4cy4rGgaVp916NWBEZWz+r0J43B4Y1Wp1kEQUZwvjlyyBcdVIqERfufQxSdqnQX4XYEMjTrUbscr9eDWKWjugY2EXkC9o/VakRwV8X6c96tKeLiuBLwiUQx1byHUA3KCVweBlasJtiIvlGCM85o9ZmuKMSQYUwcEKeFbblPsoAUl2jxnvPa5Iydtfyd8kdevYj+Y8ygC9qkVso6UyF8vg7f4xlbDhuCrLGX4a/wRtfUM8gU4kze3l+CtX36VNKe3T2WHF8tO4bOHFWYIAAgipZIQ4tyNQ6PDk2UFi+/h8NRe+PcPJQd6OHOJ4lKbU4hL+fupuk77inkV5qNnmkmz/hpFr/hfxScQ5EQWwQoZOVv5v+cyydFOQQA8VZuVprC6nrWELBOZL1UR3e8BeeFiA7SqY/0t7A0/2fYDJ10mm/ObJvmxcWDEbmfBSmy4mDJ374ff1HX6aexsYOiKsWyLRVHmn1zjl50ns8EeZktgO9 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)(93006095)(93004095)(10201501046)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016);SRVR:DM2PR07MB1465;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1465; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1465;4:4g17vl+XWc1RlnzV4bsaCX8LTlksd4phuE5Ts+t+VwHHYArAsA1xvSRUouHO2oflWv+ksUTc6S2kUvDxxVh+XL1UPYqrlsiO23HJhr+0GZD/XDlolmTnz1YG5Om9hsDFgKPaH0iBCGmYenDDsjmSj5jCmUzgAuhlrvuiItVO91hntZonrGHAw4nCF2w0d1N0ogx/k1SkodCPNezyPICHu8UXciiWA3kDtIWMVnumE71tIezTiC5zGycyGJRCnUXWySd4dFG/yh877SMEoDHszw== X-Forefront-PRVS: 0744CFB5E8 X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1465;23:b5etE7dFzK6Khjet8E8ep//kaMHPGBSzviN8JER5dnPFSIc3hvW0oUFa2VQu4BinaLf64cHMqrlLLMKp9w7GP5eN+yDJL5PUpJl3adb6i6WnTrMzNJrDVbn3dj4yvtbMcckYi+lUprzGV9ud8hsenCx4wniCwk1NYAEDzMWFsqmq7mhBZ6McHZo6Ya0UPYg+6sC3HG9FyZRb5RXThyM1kuDzL/2BM/mPaV5tvY/df4NAo1Mp9g9aVofrVo2+J0QmEK1GwiKJzCqlHnbVCkaSU0y10iJ8vbfSToWYtHS93HDJbU63XEorHza3IFIF4ddYyXD11uPt1iqmIu2tWCRlDZz3w4KQddh+jC04SJZiu7j0jb4Ox50/R4GuOO3Js30ldHjHjRI2eTXRo/2v8El83p7GcHS0GuUrKAh/oPzzlKeUXgPeJ7hUTpQHHdMjvJ5FtV72r0F86CKKrTgN9K3AmvzM7S9KxUDiQRs0KzVR4QzNyI1lBnKnkMBFoqAaA9IkzgnacjLqEOy8N6nyccWd5eS0t1Q2OJff880LjQsZOZSLsLPRkLA3SUHkehWFt4K4lW0v2cjUL6nSRIAZahF51I9/IrB5ePRmr8aqqK3Fl7OHSy2mK/AF/pLBVp8GvNyCDCF20uF3q9Z6gwiC985L3WfgwVR9EZ/dd2K2eAaGNorqj7Hpigbcyn8tqEOEKFsDkpRK1d8vwsSk1qFhHN6Zw8reK0pa19aup47grpFUmssT21kHwkVF8X4izuThHmQJhe28E11LCMRr8rpP183kNQdblQsZr1hqaAVjzcBVlvAKRD00PP/gKD5lEAPUC56dVqxwN8LumuF9p/owKqil7q6d5QObIbPjKgvjedjwh8KFvYY6yALpQtQ4NYEmPhPiqgVrGdU/aZm7hl/QTaI2Lg6WX3ht3uJezHQmat4DlhC5H8lJF5PKUzHuJPUWmTH/CPS8HbdeupRgvotWWTUSxSAGmqr6NjNcBpa48VKnVp+ru/XPbQQCqoBLI22XXk67W5PKIH4r7csvdGPVxtXntCiO6UeMYqkuYoWgxrimchC8+JW0T1Dkh3C+RdJGbYzN0PceJvYrYUzsBxMQIZYKJs2ZF7rnQl3yUuPSkBbsr9I= X-Microsoft-Antispam-Message-Info: 35AI6Yg4dteENDP0GwblJ/icZ7SLlcohI8xLNcHFur8CQPcnghUECUBiPLFSz/po1Bo2lJh+OLUrBsRkvxFvrhBXm27FVL+ocszlR/G/pwjYvgEq/f9Nseo+AiRlSAv4TZedsYxtUukU9Qoa+sBB6yHbEbDHegUe/8XWa1Z7PjoGVu1ylF4sdPVOC2BPSp7CLbBHy9s9pi2XxBHLgvBeC6ZrbjGzsE4nfadpUC026eW2i8uZ5cTgxK2SO8wfEMsJOB64PIo8rQO9dP7vpw1DW1s3C8FTsNR7dwmAF/mNz93LRgifMWEMYczJHiZUMzgN7LoVW6F2pFmHk5yboUBwhFvcHEjAOPmwxGiSKEghmS0= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1465;6:IvYEBz/dhAGrTe7n6aavrwLCMCIwtLRtxLN1WgZa+X9Mfdev3MrdMLZ/bYr9Y6HKJEGo+HsITlAxS/O0r41c53HZdl1ag6Gfrdo1FEk+CDIFvoXqsH5POBeMkFR1oo38Hu9KAm/UHf6mZS3uUMTbE7Tv72QYmIGL5IiXSIDrLCSgT2+3UpC2nknjveNpYhDAIvUL9MkM7CDPTbVwBWFMzXctEv9cvB2znOr+N9gv2RFqbFK2L2h7i0O+lJzvDil35Zb2gEEua+yP93UpaiLPVwsREkhTAYvtzQ07PrLiczbRFT4MsDuPJwu8NUzBnzogNfgra//EiOnQm9r9b6o/5BOOxYu3LRjz95lVlfQ9WGhIe9P18STgRyU/rC9HFmO8Vs+2sGB+mDkHxFYCDJIWEKudUE1VoFpbrrnZYBUHaei7jv4CZZEws8NsgoQlTTCEhRu9pNGtDdtzQYFGgyoUUQ==;5:kni/7eGqasQ4GiYh6/s+b7gK5wZCjb8RIIwB4I30HdVxloYDa4DMmz2J5hCDWSRtL+cA9onKnzAmwduGtNkxIsmnfn3ADrjB0DyVSUPadxB8AFxc3ipTL6sZjYGOBkY+rEYZgSNEf9r7XVJnjXSDr2sAAm6hI6J4/FhcI/G2qRM=;7:07XdKUPoq5mjOGJKTZDY6QFhzh3avgGY1N2HJZsml2gFWWJ+9TlzG2WV6nBYEZT6cFfNxBTPbNfv/lIs6fRvzolLgFeRWFFeHKg3gN5x6LjrD24GCJWKuQa4lX0s4lu/T8l7vH9mxRzZFvC0yTCfjrzoY8ZfYIWUY93zoLTtZljacY/HPLOEvHA9qajAI/zbrULJk1bwUdGs7k+KSJORiRomgWGno32y64h1EeQyb0vBR9Qc/pimEsTTYaqmN1tq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 17:01:24.6699 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48326711-c1d4-4e8d-0ef6-08d5f250414d 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: DM2PR07MB1465 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 1b19b954bbae..f7d03cddb583 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4688,110 +4688,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. * @@ -4848,14 +4744,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,