From b4d69388f3fe0620a5677b7b6b99d16218cfc275 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 15 Mar 2021 03:41:36 +0000 Subject: [PATCH] qla2x00t-32gbit: Minimize diffs with upstream git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9361 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_nvme.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c index 1fd37eb68..4da6a9e8a 100644 --- a/qla2x00t-32gbit/qla_nvme.c +++ b/qla2x00t-32gbit/qla_nvme.c @@ -304,7 +304,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, struct qla_hw_data *ha; srb_t *sp; - if (!fcport || (fcport && fcport->deleted)) + if (!fcport || fcport->deleted) return rval; vha = fcport->vha; @@ -653,15 +653,6 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) } static struct nvme_fc_port_template qla_nvme_fc_transport = { -#if 0 - /* - * See also commit 863fbae929c7 ("nvme_fc: add module to ops template - * to allow module references"). See also commit 8c5c66052920 - * ("nvme-fc: Revert "add module to ops template to allow module - * references"") # v5.7-rc1. - */ - .module = THIS_MODULE, -#endif .localport_delete = qla_nvme_localport_delete, .remoteport_delete = qla_nvme_remoteport_delete, .create_queue = qla_nvme_alloc_queue,