Merge branch 'for-linus' from git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_nvme.c

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 6cc19e0..bfcd02f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -224,8 +224,8 @@ static void qla_nvme_abort_work(struct work_struct *work)
 
        if (ha->flags.host_shutting_down) {
                ql_log(ql_log_info, sp->fcport->vha, 0xffff,
-                   "%s Calling done on sp: %p, type: 0x%x, sp->ref_count: 0x%x\n",
-                   __func__, sp, sp->type, atomic_read(&sp->ref_count));
+                   "%s Calling done on sp: %p, type: 0x%x\n",
+                   __func__, sp, sp->type);
                sp->done(sp, 0);
                goto out;
        }
@@ -610,6 +610,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
 }
 
 static struct nvme_fc_port_template qla_nvme_fc_transport = {
+       .module = THIS_MODULE,
        .localport_delete = qla_nvme_localport_delete,
        .remoteport_delete = qla_nvme_remoteport_delete,
        .create_queue   = qla_nvme_alloc_queue,