scsi: target: drop unnecessary get_fabric_name() accessor from fabric_ops

[linux-2.6-block.git] / drivers / target / target_core_tpg.c

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 02e8a5d8665837f415ac7b2d78e51067d1ef5b62..16e7a6500be462e9e6dbc3cb0fb062d395a59fa6 100644 (file)
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -151,7 +151,7 @@ void core_tpg_add_node_to_devs(
 
                pr_debug("TARGET_CORE[%s]->TPG[%u]_LUN[%llu] - Adding %s"
                        " access for LUN in Demo Mode\n",
-                       tpg->se_tpg_tfo->get_fabric_name(),
+                       tpg->se_tpg_tfo->fabric_name,
                        tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                        lun_access_ro ? "READ-ONLY" : "READ-WRITE");
 
@@ -176,7 +176,7 @@ target_set_nacl_queue_depth(struct se_portal_group *tpg,
 
        if (!acl->queue_depth) {
                pr_warn("Queue depth for %s Initiator Node: %s is 0,"
-                       "defaulting to 1.\n", tpg->se_tpg_tfo->get_fabric_name(),
+                       "defaulting to 1.\n", tpg->se_tpg_tfo->fabric_name,
                        acl->initiatorname);
                acl->queue_depth = 1;
        }
@@ -227,11 +227,11 @@ static void target_add_node_acl(struct se_node_acl *acl)
 
        pr_debug("%s_TPG[%hu] - Added %s ACL with TCQ Depth: %d for %s"
                " Initiator Node: %s\n",
-               tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->fabric_name,
                tpg->se_tpg_tfo->tpg_get_tag(tpg),
                acl->dynamic_node_acl ? "DYNAMIC" : "",
                acl->queue_depth,
-               tpg->se_tpg_tfo->get_fabric_name(),
+               tpg->se_tpg_tfo->fabric_name,
                acl->initiatorname);
 }
 
@@ -313,7 +313,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
                if (acl->dynamic_node_acl) {
                        acl->dynamic_node_acl = 0;
                        pr_debug("%s_TPG[%u] - Replacing dynamic ACL"
-                               " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                               " for %s\n", tpg->se_tpg_tfo->fabric_name,
                                tpg->se_tpg_tfo->tpg_get_tag(tpg), initiatorname);
                        mutex_unlock(&tpg->acl_node_mutex);
                        return acl;
@@ -321,7 +321,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
 
                pr_err("ACL entry for %s Initiator"
                        " Node %s already exists for TPG %u, ignoring"
-                       " request.\n",  tpg->se_tpg_tfo->get_fabric_name(),
+                       " request.\n",  tpg->se_tpg_tfo->fabric_name,
                        initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
                mutex_unlock(&tpg->acl_node_mutex);
                return ERR_PTR(-EEXIST);
@@ -380,9 +380,9 @@ void core_tpg_del_initiator_node_acl(struct se_node_acl *acl)
        core_free_device_list_for_node(acl, tpg);
 
        pr_debug("%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
-               " Initiator Node: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+               " Initiator Node: %s\n", tpg->se_tpg_tfo->fabric_name,
                tpg->se_tpg_tfo->tpg_get_tag(tpg), acl->queue_depth,
-               tpg->se_tpg_tfo->get_fabric_name(), acl->initiatorname);
+               tpg->se_tpg_tfo->fabric_name, acl->initiatorname);
 
        kfree(acl);
 }
@@ -418,7 +418,7 @@ int core_tpg_set_initiator_node_queue_depth(
 
        pr_debug("Successfully changed queue depth to: %d for Initiator"
                " Node: %s on %s Target Portal Group: %u\n", acl->queue_depth,
-               acl->initiatorname, tpg->se_tpg_tfo->get_fabric_name(),
+               acl->initiatorname, tpg->se_tpg_tfo->fabric_name,
                tpg->se_tpg_tfo->tpg_get_tag(tpg));
 
        return 0;
@@ -512,7 +512,7 @@ int core_tpg_register(
        spin_unlock_bh(&tpg_lock);
 
        pr_debug("TARGET_CORE[%s]: Allocated portal_group for endpoint: %s, "
-                "Proto: %d, Portal Tag: %u\n", se_tpg->se_tpg_tfo->get_fabric_name(),
+                "Proto: %d, Portal Tag: %u\n", se_tpg->se_tpg_tfo->fabric_name,
                se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg) ?
                se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg) : NULL,
                se_tpg->proto_id, se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg));
@@ -528,7 +528,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
        LIST_HEAD(node_list);
 
        pr_debug("TARGET_CORE[%s]: Deallocating portal_group for endpoint: %s, "
-                "Proto: %d, Portal Tag: %u\n", tfo->get_fabric_name(),
+                "Proto: %d, Portal Tag: %u\n", tfo->fabric_name,
                tfo->tpg_get_wwn(se_tpg) ? tfo->tpg_get_wwn(se_tpg) : NULL,
                se_tpg->proto_id, tfo->tpg_get_tag(se_tpg));