1 files changed, 10 insertions, 58 deletions

diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 9512af6a8114..18b0f9703ff2 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -42,8 +42,7 @@
 
 #include "sbp_target.h"
 
-/* Local pointer to allocated TCM configfs fabric module */
-static struct target_fabric_configfs *sbp_fabric_configfs;
+static const struct target_core_fabric_ops sbp_ops;
 
 /* FireWire address region for management and command block address handlers */
 static const struct fw_address_region sbp_register_region = {
@@ -2215,8 +2214,7 @@ static struct se_portal_group *sbp_make_tpg(
                 goto out_free_tpg;
         }
 
-        ret = core_tpg_register(&sbp_fabric_configfs->tf_ops, wwn,
-                        &tpg->se_tpg, (void *)tpg,
+        ret = core_tpg_register(&sbp_ops, wwn, &tpg->se_tpg, tpg,
                         TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0)
                 goto out_unreg_mgt_agt;
@@ -2503,7 +2501,9 @@ static struct configfs_attribute *sbp_tpg_attrib_attrs[] = {
         NULL,
 };
 
-static struct target_core_fabric_ops sbp_ops = {
+static const struct target_core_fabric_ops sbp_ops = {
+        .module                         = THIS_MODULE,
+        .name                           = "sbp",
         .get_fabric_name                = sbp_get_fabric_name,
         .get_fabric_proto_ident         = sbp_get_fabric_proto_ident,
         .tpg_get_wwn                    = sbp_get_fabric_wwn,
@@ -2544,68 +2544,20 @@ static struct target_core_fabric_ops sbp_ops = {
         .fabric_drop_np                 = NULL,
         .fabric_make_nodeacl            = sbp_make_nodeacl,
         .fabric_drop_nodeacl            = sbp_drop_nodeacl,
-};
-
-static int sbp_register_configfs(void)
-{
-        struct target_fabric_configfs *fabric;
-        int ret;
-
-        fabric = target_fabric_configfs_init(THIS_MODULE, "sbp");
-        if (IS_ERR(fabric)) {
-                pr_err("target_fabric_configfs_init() failed\n");
-                return PTR_ERR(fabric);
-        }
-
-        fabric->tf_ops = sbp_ops;
-
-        /*
-         * Setup default attribute lists for various fabric->tf_cit_tmpl
-         */
-        fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = sbp_wwn_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-
-        ret = target_fabric_configfs_register(fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() failed for SBP\n");
-                return ret;
-        }
 
-        sbp_fabric_configfs = fabric;
-
-        return 0;
-};
-
-static void sbp_deregister_configfs(void)
-{
-        if (!sbp_fabric_configfs)
-                return;
-
-        target_fabric_configfs_deregister(sbp_fabric_configfs);
-        sbp_fabric_configfs = NULL;
+        .tfc_wwn_attrs                  = sbp_wwn_attrs,
+        .tfc_tpg_base_attrs             = sbp_tpg_base_attrs,
+        .tfc_tpg_attrib_attrs           = sbp_tpg_attrib_attrs,
 };
 
 static int __init sbp_init(void)
 {
-        int ret;
-
-        ret = sbp_register_configfs();
-        if (ret < 0)
-                return ret;
-
-        return 0;
+        return target_register_template(&sbp_ops);
 };
 
 static void __exit sbp_exit(void)
 {
-        sbp_deregister_configfs();
+        target_unregister_template(&sbp_ops);
 };
 
 MODULE_DESCRIPTION("FireWire SBP fabric driver");