50 files changed, 165 insertions, 165 deletions

diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index 853bc7fc673f..b58850389094 100644
--- a/drivers/acpi/acpi_configfs.c
+++ b/drivers/acpi/acpi_configfs.c
@@ -204,7 +204,7 @@ struct configfs_attribute *acpi_table_attrs[] = {
         NULL,
 };
 
-static struct config_item_type acpi_table_type = {
+static const struct config_item_type acpi_table_type = {
         .ct_owner = THIS_MODULE,
         .ct_bin_attrs = acpi_table_bin_attrs,
         .ct_attrs = acpi_table_attrs,
@@ -237,12 +237,12 @@ struct configfs_group_operations acpi_table_group_ops = {
         .drop_item = acpi_table_drop_item,
 };
 
-static struct config_item_type acpi_tables_type = {
+static const struct config_item_type acpi_tables_type = {
         .ct_owner = THIS_MODULE,
         .ct_group_ops = &acpi_table_group_ops,
 };
 
-static struct config_item_type acpi_root_group_type = {
+static const struct config_item_type acpi_root_group_type = {
         .ct_owner = THIS_MODULE,
 };
 
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 8042c26ea9e6..cda69dbefe3b 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -476,7 +476,7 @@ static struct configfs_item_operations nullb_device_ops = {
         .release        = nullb_device_release,
 };
 
-static struct config_item_type nullb_device_type = {
+static const struct config_item_type nullb_device_type = {
         .ct_item_ops    = &nullb_device_ops,
         .ct_attrs       = nullb_device_attrs,
         .ct_owner       = THIS_MODULE,
@@ -528,7 +528,7 @@ static struct configfs_group_operations nullb_group_ops = {
         .drop_item      = nullb_group_drop_item,
 };
 
-static struct config_item_type nullb_group_type = {
+static const struct config_item_type nullb_group_type = {
         .ct_group_ops   = &nullb_group_ops,
         .ct_attrs       = nullb_group_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/hwtracing/stm/policy.c b/drivers/hwtracing/stm/policy.c
index 6c0ae2996326..33e9a1b6ea7c 100644
--- a/drivers/hwtracing/stm/policy.c
+++ b/drivers/hwtracing/stm/policy.c
@@ -187,8 +187,8 @@ static struct configfs_attribute *stp_policy_node_attrs[] = {
         NULL,
 };
 
-static struct config_item_type stp_policy_type;
-static struct config_item_type stp_policy_node_type;
+static const struct config_item_type stp_policy_type;
+static const struct config_item_type stp_policy_node_type;
 
 static struct config_group *
 stp_policy_node_make(struct config_group *group, const char *name)
@@ -236,7 +236,7 @@ static struct configfs_group_operations stp_policy_node_group_ops = {
         .drop_item      = stp_policy_node_drop,
 };
 
-static struct config_item_type stp_policy_node_type = {
+static const struct config_item_type stp_policy_node_type = {
         .ct_item_ops    = &stp_policy_node_item_ops,
         .ct_group_ops   = &stp_policy_node_group_ops,
         .ct_attrs       = stp_policy_node_attrs,
@@ -311,7 +311,7 @@ static struct configfs_group_operations stp_policy_group_ops = {
         .make_group     = stp_policy_node_make,
 };
 
-static struct config_item_type stp_policy_type = {
+static const struct config_item_type stp_policy_type = {
         .ct_item_ops    = &stp_policy_item_ops,
         .ct_group_ops   = &stp_policy_group_ops,
         .ct_attrs       = stp_policy_attrs,
@@ -380,7 +380,7 @@ static struct configfs_group_operations stp_policies_group_ops = {
         .make_group     = stp_policies_make,
 };
 
-static struct config_item_type stp_policies_type = {
+static const struct config_item_type stp_policies_type = {
         .ct_group_ops   = &stp_policies_group_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/iio/dummy/iio_simple_dummy.c b/drivers/iio/dummy/iio_simple_dummy.c
index a45d01e9b8e8..62052479c349 100644
--- a/drivers/iio/dummy/iio_simple_dummy.c
+++ b/drivers/iio/dummy/iio_simple_dummy.c
@@ -26,7 +26,7 @@
 #include <linux/iio/sw_device.h>
 #include "iio_simple_dummy.h"
 
-static struct config_item_type iio_dummy_type = {
+static const struct config_item_type iio_dummy_type = {
         .ct_owner = THIS_MODULE,
 };
 
diff --git a/drivers/iio/industrialio-configfs.c b/drivers/iio/industrialio-configfs.c
index 45ce2bc47180..5a0aae119369 100644
--- a/drivers/iio/industrialio-configfs.c
+++ b/drivers/iio/industrialio-configfs.c
@@ -17,7 +17,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/configfs.h>
 
-static struct config_item_type iio_root_group_type = {
+static const struct config_item_type iio_root_group_type = {
         .ct_owner       = THIS_MODULE,
 };
 
diff --git a/drivers/iio/industrialio-sw-device.c b/drivers/iio/industrialio-sw-device.c
index 81b49cfca452..90df97c542f6 100644
--- a/drivers/iio/industrialio-sw-device.c
+++ b/drivers/iio/industrialio-sw-device.c
@@ -19,9 +19,9 @@
 #include <linux/configfs.h>
 
 static struct config_group *iio_devices_group;
-static struct config_item_type iio_device_type_group_type;
+static const struct config_item_type iio_device_type_group_type;
 
-static struct config_item_type iio_devices_group_type = {
+static const struct config_item_type iio_devices_group_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -156,7 +156,7 @@ static struct configfs_group_operations device_ops = {
         .drop_item      = &device_drop_group,
 };
 
-static struct config_item_type iio_device_type_group_type = {
+static const struct config_item_type iio_device_type_group_type = {
         .ct_group_ops = &device_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/iio/industrialio-sw-trigger.c b/drivers/iio/industrialio-sw-trigger.c
index 8d24fb159cc9..bc6b7fb43e3a 100644
--- a/drivers/iio/industrialio-sw-trigger.c
+++ b/drivers/iio/industrialio-sw-trigger.c
@@ -19,9 +19,9 @@
 #include <linux/configfs.h>
 
 static struct config_group *iio_triggers_group;
-static struct config_item_type iio_trigger_type_group_type;
+static const struct config_item_type iio_trigger_type_group_type;
 
-static struct config_item_type iio_triggers_group_type = {
+static const struct config_item_type iio_triggers_group_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -156,7 +156,7 @@ static struct configfs_group_operations trigger_ops = {
         .drop_item      = &trigger_drop_group,
 };
 
-static struct config_item_type iio_trigger_type_group_type = {
+static const struct config_item_type iio_trigger_type_group_type = {
         .ct_group_ops = &trigger_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/iio/trigger/iio-trig-hrtimer.c b/drivers/iio/trigger/iio-trig-hrtimer.c
index 3ee92160053f..7accd0187ba1 100644
--- a/drivers/iio/trigger/iio-trig-hrtimer.c
+++ b/drivers/iio/trigger/iio-trig-hrtimer.c
@@ -30,7 +30,7 @@ struct iio_hrtimer_info {
         ktime_t period;
 };
 
-static struct config_item_type iio_hrtimer_type = {
+static const struct config_item_type iio_hrtimer_type = {
         .ct_owner = THIS_MODULE,
 };
 
diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c
index b4b02dbd6e8a..94a90e0a3fdb 100644
--- a/drivers/iio/trigger/iio-trig-loop.c
+++ b/drivers/iio/trigger/iio-trig-loop.c
@@ -36,7 +36,7 @@ struct iio_loop_info {
         struct task_struct *task;
 };
 
-static struct config_item_type iio_loop_type = {
+static const struct config_item_type iio_loop_type = {
         .ct_owner = THIS_MODULE,
 };
 
diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniband/core/cma_configfs.c
index 54076a3e8007..31dfee0c8295 100644
--- a/drivers/infiniband/core/cma_configfs.c
+++ b/drivers/infiniband/core/cma_configfs.c
@@ -186,7 +186,7 @@ static struct configfs_attribute *cma_configfs_attributes[] = {
         NULL,
 };
 
-static struct config_item_type cma_port_group_type = {
+static const struct config_item_type cma_port_group_type = {
         .ct_attrs       = cma_configfs_attributes,
         .ct_owner       = THIS_MODULE
 };
@@ -263,7 +263,7 @@ static struct configfs_item_operations cma_ports_item_ops = {
         .release = release_cma_ports_group
 };
 
-static struct config_item_type cma_ports_group_type = {
+static const struct config_item_type cma_ports_group_type = {
         .ct_item_ops    = &cma_ports_item_ops,
         .ct_owner       = THIS_MODULE
 };
@@ -272,7 +272,7 @@ static struct configfs_item_operations cma_device_item_ops = {
         .release = release_cma_dev
 };
 
-static struct config_item_type cma_device_group_type = {
+static const struct config_item_type cma_device_group_type = {
         .ct_item_ops    = &cma_device_item_ops,
         .ct_owner       = THIS_MODULE
 };
@@ -323,7 +323,7 @@ static struct configfs_group_operations cma_subsys_group_ops = {
         .make_group     = make_cma_dev,
 };
 
-static struct config_item_type cma_subsys_type = {
+static const struct config_item_type cma_subsys_type = {
         .ct_group_ops   = &cma_subsys_group_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 0e27920c2b6b..be9aa368639f 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -616,7 +616,7 @@ static struct configfs_item_operations netconsole_target_item_ops = {
         .release                = netconsole_target_release,
 };
 
-static struct config_item_type netconsole_target_type = {
+static const struct config_item_type netconsole_target_type = {
         .ct_attrs               = netconsole_target_attrs,
         .ct_item_ops            = &netconsole_target_item_ops,
         .ct_owner               = THIS_MODULE,
@@ -682,7 +682,7 @@ static struct configfs_group_operations netconsole_subsys_group_ops = {
         .drop_item      = drop_netconsole_target,
 };
 
-static struct config_item_type netconsole_subsys_type = {
+static const struct config_item_type netconsole_subsys_type = {
         .ct_group_ops   = &netconsole_subsys_group_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index b6aeb1d70951..e6b2d2af81b6 100644
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -20,8 +20,8 @@
 
 #include "nvmet.h"
 
-static struct config_item_type nvmet_host_type;
-static struct config_item_type nvmet_subsys_type;
+static const struct config_item_type nvmet_host_type;
+static const struct config_item_type nvmet_subsys_type;
 
 /*
  * nvmet_port Generic ConfigFS definitions.
@@ -425,7 +425,7 @@ static struct configfs_item_operations nvmet_ns_item_ops = {
         .release                = nvmet_ns_release,
 };
 
-static struct config_item_type nvmet_ns_type = {
+static const struct config_item_type nvmet_ns_type = {
         .ct_item_ops            = &nvmet_ns_item_ops,
         .ct_attrs               = nvmet_ns_attrs,
         .ct_owner               = THIS_MODULE,
@@ -464,7 +464,7 @@ static struct configfs_group_operations nvmet_namespaces_group_ops = {
         .make_group             = nvmet_ns_make,
 };
 
-static struct config_item_type nvmet_namespaces_type = {
+static const struct config_item_type nvmet_namespaces_type = {
         .ct_group_ops           = &nvmet_namespaces_group_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -540,7 +540,7 @@ static struct configfs_item_operations nvmet_port_subsys_item_ops = {
         .drop_link              = nvmet_port_subsys_drop_link,
 };
 
-static struct config_item_type nvmet_port_subsys_type = {
+static const struct config_item_type nvmet_port_subsys_type = {
         .ct_item_ops            = &nvmet_port_subsys_item_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -613,7 +613,7 @@ static struct configfs_item_operations nvmet_allowed_hosts_item_ops = {
         .drop_link              = nvmet_allowed_hosts_drop_link,
 };
 
-static struct config_item_type nvmet_allowed_hosts_type = {
+static const struct config_item_type nvmet_allowed_hosts_type = {
         .ct_item_ops            = &nvmet_allowed_hosts_item_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -729,7 +729,7 @@ static struct configfs_item_operations nvmet_subsys_item_ops = {
         .release                = nvmet_subsys_release,
 };
 
-static struct config_item_type nvmet_subsys_type = {
+static const struct config_item_type nvmet_subsys_type = {
         .ct_item_ops            = &nvmet_subsys_item_ops,
         .ct_attrs               = nvmet_subsys_attrs,
         .ct_owner               = THIS_MODULE,
@@ -767,7 +767,7 @@ static struct configfs_group_operations nvmet_subsystems_group_ops = {
         .make_group             = nvmet_subsys_make,
 };
 
-static struct config_item_type nvmet_subsystems_type = {
+static const struct config_item_type nvmet_subsystems_type = {
         .ct_group_ops           = &nvmet_subsystems_group_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -827,7 +827,7 @@ static struct configfs_item_operations nvmet_referral_item_ops = {
         .release        = nvmet_referral_release,
 };
 
-static struct config_item_type nvmet_referral_type = {
+static const struct config_item_type nvmet_referral_type = {
         .ct_owner       = THIS_MODULE,
         .ct_attrs       = nvmet_referral_attrs,
         .ct_item_ops    = &nvmet_referral_item_ops,
@@ -852,7 +852,7 @@ static struct configfs_group_operations nvmet_referral_group_ops = {
         .make_group             = nvmet_referral_make,
 };
 
-static struct config_item_type nvmet_referrals_type = {
+static const struct config_item_type nvmet_referrals_type = {
         .ct_owner       = THIS_MODULE,
         .ct_group_ops   = &nvmet_referral_group_ops,
 };
@@ -880,7 +880,7 @@ static struct configfs_item_operations nvmet_port_item_ops = {
         .release                = nvmet_port_release,
 };
 
-static struct config_item_type nvmet_port_type = {
+static const struct config_item_type nvmet_port_type = {
         .ct_attrs               = nvmet_port_attrs,
         .ct_item_ops            = &nvmet_port_item_ops,
         .ct_owner               = THIS_MODULE,
@@ -921,7 +921,7 @@ static struct configfs_group_operations nvmet_ports_group_ops = {
         .make_group             = nvmet_ports_make,
 };
 
-static struct config_item_type nvmet_ports_type = {
+static const struct config_item_type nvmet_ports_type = {
         .ct_group_ops           = &nvmet_ports_group_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -940,7 +940,7 @@ static struct configfs_item_operations nvmet_host_item_ops = {
         .release                = nvmet_host_release,
 };
 
-static struct config_item_type nvmet_host_type = {
+static const struct config_item_type nvmet_host_type = {
         .ct_item_ops            = &nvmet_host_item_ops,
         .ct_owner               = THIS_MODULE,
 };
@@ -963,14 +963,14 @@ static struct configfs_group_operations nvmet_hosts_group_ops = {
         .make_group             = nvmet_hosts_make_group,
 };
 
-static struct config_item_type nvmet_hosts_type = {
+static const struct config_item_type nvmet_hosts_type = {
         .ct_group_ops           = &nvmet_hosts_group_ops,
         .ct_owner               = THIS_MODULE,
 };
 
 static struct config_group nvmet_hosts_group;
 
-static struct config_item_type nvmet_root_type = {
+static const struct config_item_type nvmet_root_type = {
         .ct_owner               = THIS_MODULE,
 };
 
diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c
index 424fdd6ed1ca..4f74386c1ced 100644
--- a/drivers/pci/endpoint/pci-ep-cfs.c
+++ b/drivers/pci/endpoint/pci-ep-cfs.c
@@ -150,7 +150,7 @@ static struct configfs_item_operations pci_epc_item_ops = {
         .drop_link      = pci_epc_epf_unlink,
 };
 
-static struct config_item_type pci_epc_type = {
+static const struct config_item_type pci_epc_type = {
         .ct_item_ops    = &pci_epc_item_ops,
         .ct_attrs       = pci_epc_attrs,
         .ct_owner       = THIS_MODULE,
@@ -361,7 +361,7 @@ static struct configfs_item_operations pci_epf_ops = {
         .release                = pci_epf_release,
 };
 
-static struct config_item_type pci_epf_type = {
+static const struct config_item_type pci_epf_type = {
         .ct_item_ops    = &pci_epf_ops,
         .ct_attrs       = pci_epf_attrs,
         .ct_owner       = THIS_MODULE,
@@ -400,7 +400,7 @@ static struct configfs_group_operations pci_epf_group_ops = {
         .drop_item      = &pci_epf_drop,
 };
 
-static struct config_item_type pci_epf_group_type = {
+static const struct config_item_type pci_epf_group_type = {
         .ct_group_ops   = &pci_epf_group_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -428,15 +428,15 @@ void pci_ep_cfs_remove_epf_group(struct config_group *group)
 }
 EXPORT_SYMBOL(pci_ep_cfs_remove_epf_group);
 
-static struct config_item_type pci_functions_type = {
+static const struct config_item_type pci_functions_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-static struct config_item_type pci_controllers_type = {
+static const struct config_item_type pci_controllers_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-static struct config_item_type pci_ep_type = {
+static const struct config_item_type pci_ep_type = {
         .ct_owner       = THIS_MODULE,
 };
 
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index 411cb266a47d..df0a39811dc2 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -187,7 +187,7 @@ static struct configfs_attribute *iscsi_stat_instance_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_instance_cit = {
+const struct config_item_type iscsi_stat_instance_cit = {
         .ct_attrs               = iscsi_stat_instance_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -249,7 +249,7 @@ static struct configfs_attribute *iscsi_stat_sess_err_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_sess_err_cit = {
+const struct config_item_type iscsi_stat_sess_err_cit = {
         .ct_attrs               = iscsi_stat_sess_err_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -390,7 +390,7 @@ static struct configfs_attribute *iscsi_stat_tgt_attr_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_tgt_attr_cit = {
+const struct config_item_type iscsi_stat_tgt_attr_cit = {
         .ct_attrs               = iscsi_stat_tgt_attr_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -522,7 +522,7 @@ static struct configfs_attribute *iscsi_stat_login_stats_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_login_cit = {
+const struct config_item_type iscsi_stat_login_cit = {
         .ct_attrs               = iscsi_stat_login_stats_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -579,7 +579,7 @@ static struct configfs_attribute *iscsi_stat_logout_stats_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_logout_cit = {
+const struct config_item_type iscsi_stat_logout_cit = {
         .ct_attrs               = iscsi_stat_logout_stats_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -801,7 +801,7 @@ static struct configfs_attribute *iscsi_stat_sess_stats_attrs[] = {
         NULL,
 };
 
-struct config_item_type iscsi_stat_sess_cit = {
+const struct config_item_type iscsi_stat_sess_cit = {
         .ct_attrs               = iscsi_stat_sess_stats_attrs,
         .ct_owner               = THIS_MODULE,
 };
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 7e87d952bb7a..bd87cc26c6e5 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -307,7 +307,7 @@ static struct configfs_attribute *target_core_fabric_item_attrs[] = {
 /*
  * Provides Fabrics Groups and Item Attributes for /sys/kernel/config/target/
  */
-static struct config_item_type target_core_fabrics_item = {
+static const struct config_item_type target_core_fabrics_item = {
         .ct_group_ops   = &target_core_fabric_group_ops,
         .ct_attrs       = target_core_fabric_item_attrs,
         .ct_owner       = THIS_MODULE,
@@ -2376,7 +2376,7 @@ static struct configfs_item_operations target_core_alua_lu_gp_ops = {
         .release                = target_core_alua_lu_gp_release,
 };
 
-static struct config_item_type target_core_alua_lu_gp_cit = {
+static const struct config_item_type target_core_alua_lu_gp_cit = {
         .ct_item_ops            = &target_core_alua_lu_gp_ops,
         .ct_attrs               = target_core_alua_lu_gp_attrs,
         .ct_owner               = THIS_MODULE,
@@ -2434,7 +2434,7 @@ static struct configfs_group_operations target_core_alua_lu_gps_group_ops = {
         .drop_item              = &target_core_alua_drop_lu_gp,
 };
 
-static struct config_item_type target_core_alua_lu_gps_cit = {
+static const struct config_item_type target_core_alua_lu_gps_cit = {
         .ct_item_ops            = NULL,
         .ct_group_ops           = &target_core_alua_lu_gps_group_ops,
         .ct_owner               = THIS_MODULE,
@@ -2813,7 +2813,7 @@ static struct configfs_item_operations target_core_alua_tg_pt_gp_ops = {
         .release                = target_core_alua_tg_pt_gp_release,
 };
 
-static struct config_item_type target_core_alua_tg_pt_gp_cit = {
+static const struct config_item_type target_core_alua_tg_pt_gp_cit = {
         .ct_item_ops            = &target_core_alua_tg_pt_gp_ops,
         .ct_attrs               = target_core_alua_tg_pt_gp_attrs,
         .ct_owner               = THIS_MODULE,
@@ -2884,7 +2884,7 @@ TB_CIT_SETUP(dev_alua_tg_pt_gps, NULL, &target_core_alua_tg_pt_gps_group_ops, NU
  * core/alua/lu_gps and core/alua/tg_pt_gps that are attached to
  * target_core_alua_cit in target_core_init_configfs() below.
  */
-static struct config_item_type target_core_alua_cit = {
+static const struct config_item_type target_core_alua_cit = {
         .ct_item_ops            = NULL,
         .ct_attrs               = NULL,
         .ct_owner               = THIS_MODULE,
@@ -3105,7 +3105,7 @@ static struct configfs_item_operations target_core_hba_item_ops = {
         .release                = target_core_hba_release,
 };
 
-static struct config_item_type target_core_hba_cit = {
+static const struct config_item_type target_core_hba_cit = {
         .ct_item_ops            = &target_core_hba_item_ops,
         .ct_group_ops           = &target_core_hba_group_ops,
         .ct_attrs               = target_core_hba_attrs,
@@ -3188,7 +3188,7 @@ static struct configfs_group_operations target_core_group_ops = {
         .drop_item      = target_core_call_delhbafromtarget,
 };
 
-static struct config_item_type target_core_cit = {
+static const struct config_item_type target_core_cit = {
         .ct_item_ops    = NULL,
         .ct_group_ops   = &target_core_group_ops,
         .ct_attrs       = NULL,
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index 8038255b21e8..f0db91ebd735 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -96,7 +96,7 @@ static struct configfs_attribute *target_stat_scsi_dev_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_dev_cit = {
+static const struct config_item_type target_stat_scsi_dev_cit = {
         .ct_attrs               = target_stat_scsi_dev_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -193,7 +193,7 @@ static struct configfs_attribute *target_stat_scsi_tgt_dev_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_tgt_dev_cit = {
+static const struct config_item_type target_stat_scsi_tgt_dev_cit = {
         .ct_attrs               = target_stat_scsi_tgt_dev_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -414,7 +414,7 @@ static struct configfs_attribute *target_stat_scsi_lu_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_lu_cit = {
+static const struct config_item_type target_stat_scsi_lu_cit = {
         .ct_attrs               = target_stat_scsi_lu_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -540,7 +540,7 @@ static struct configfs_attribute *target_stat_scsi_port_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_port_cit = {
+static const struct config_item_type target_stat_scsi_port_cit = {
         .ct_attrs               = target_stat_scsi_port_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -724,7 +724,7 @@ static struct configfs_attribute *target_stat_scsi_tgt_port_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_tgt_port_cit = {
+static const struct config_item_type target_stat_scsi_tgt_port_cit = {
         .ct_attrs               = target_stat_scsi_tgt_port_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -844,7 +844,7 @@ static struct configfs_attribute *target_stat_scsi_transport_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_transport_cit = {
+static const struct config_item_type target_stat_scsi_transport_cit = {
         .ct_attrs               = target_stat_scsi_transport_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -1206,7 +1206,7 @@ static struct configfs_attribute *target_stat_scsi_auth_intr_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_auth_intr_cit = {
+static const struct config_item_type target_stat_scsi_auth_intr_cit = {
         .ct_attrs               = target_stat_scsi_auth_intr_attrs,
         .ct_owner               = THIS_MODULE,
 };
@@ -1378,7 +1378,7 @@ static struct configfs_attribute *target_stat_scsi_ath_intr_port_attrs[] = {
         NULL,
 };
 
-static struct config_item_type target_stat_scsi_att_intr_port_cit = {
+static const struct config_item_type target_stat_scsi_att_intr_port_cit = {
         .ct_attrs               = target_stat_scsi_ath_intr_port_attrs,
         .ct_owner               = THIS_MODULE,
 };
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 4ddf063b9f47..efba66ca0719 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -506,13 +506,13 @@ static struct configfs_attribute *gadget_config_attrs[] = {
         NULL,
 };
 
-static struct config_item_type gadget_config_type = {
+static const struct config_item_type gadget_config_type = {
         .ct_item_ops    = &gadget_config_item_ops,
         .ct_attrs       = gadget_config_attrs,
         .ct_owner       = THIS_MODULE,
 };
 
-static struct config_item_type gadget_root_type = {
+static const struct config_item_type gadget_root_type = {
         .ct_item_ops    = &gadget_root_item_ops,
         .ct_attrs       = gadget_root_attrs,
         .ct_owner       = THIS_MODULE,
@@ -594,7 +594,7 @@ static struct configfs_group_operations functions_ops = {
         .drop_item      = &function_drop,
 };
 
-static struct config_item_type functions_type = {
+static const struct config_item_type functions_type = {
         .ct_group_ops   = &functions_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -695,7 +695,7 @@ static struct configfs_group_operations config_desc_ops = {
         .drop_item      = &config_desc_drop,
 };
 
-static struct config_item_type config_desc_type = {
+static const struct config_item_type config_desc_type = {
         .ct_group_ops   = &config_desc_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -1477,7 +1477,7 @@ static struct configfs_group_operations gadgets_ops = {
         .drop_item      = &gadgets_drop,
 };
 
-static struct config_item_type gadgets_type = {
+static const struct config_item_type gadgets_type = {
         .ct_group_ops   = &gadgets_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 7140bf3c74fa..9fc98de83624 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -783,7 +783,7 @@ static struct configfs_attribute *acm_attrs[] = {
         NULL,
 };
 
-static struct config_item_type acm_func_type = {
+static const struct config_item_type acm_func_type = {
         .ct_item_ops    = &acm_item_ops,
         .ct_attrs       = acm_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index b322ca20cd98..b104ed0c1ab5 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -841,7 +841,7 @@ static struct configfs_attribute *ecm_attrs[] = {
         NULL,
 };
 
-static struct config_item_type ecm_func_type = {
+static const struct config_item_type ecm_func_type = {
         .ct_item_ops    = &ecm_item_ops,
         .ct_attrs       = ecm_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index def3a450a340..37557651b600 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -552,7 +552,7 @@ static struct configfs_attribute *eem_attrs[] = {
         NULL,
 };
 
-static struct config_item_type eem_func_type = {
+static const struct config_item_type eem_func_type = {
         .ct_item_ops    = &eem_item_ops,
         .ct_attrs       = eem_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index b1001c3f43fb..97ea059a7aa4 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3381,7 +3381,7 @@ static struct configfs_item_operations ffs_item_ops = {
         .release        = ffs_attr_release,
 };
 
-static struct config_item_type ffs_func_type = {
+static const struct config_item_type ffs_func_type = {
         .ct_item_ops    = &ffs_item_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 52576f1b57f1..daae35318a3a 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -988,7 +988,7 @@ static struct configfs_attribute *hid_attrs[] = {
         NULL,
 };
 
-static struct config_item_type hid_func_type = {
+static const struct config_item_type hid_func_type = {
         .ct_item_ops    = &hidg_item_ops,
         .ct_attrs       = hid_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index ed3b054a0a2e..1803646b3678 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -552,7 +552,7 @@ static struct configfs_attribute *lb_attrs[] = {
         NULL,
 };
 
-static struct config_item_type lb_func_type = {
+static const struct config_item_type lb_func_type = {
         .ct_item_ops    = &lb_item_ops,
         .ct_attrs       = lb_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 697224237976..acecd13dcbd9 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -3141,7 +3141,7 @@ static struct configfs_attribute *fsg_lun_attrs[] = {
         NULL,
 };
 
-static struct config_item_type fsg_lun_type = {
+static const struct config_item_type fsg_lun_type = {
         .ct_item_ops    = &fsg_lun_item_ops,
         .ct_attrs       = fsg_lun_attrs,
         .ct_owner       = THIS_MODULE,
@@ -3332,7 +3332,7 @@ static struct configfs_group_operations fsg_group_ops = {
         .drop_item      = fsg_lun_drop,
 };
 
-static struct config_item_type fsg_func_type = {
+static const struct config_item_type fsg_func_type = {
         .ct_item_ops    = &fsg_item_ops,
         .ct_group_ops   = &fsg_group_ops,
         .ct_attrs       = fsg_attrs,
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 5ea713a975c7..4eb96b91cc40 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -1188,7 +1188,7 @@ static struct configfs_attribute *midi_attrs[] = {
         NULL,
 };
 
-static struct config_item_type midi_func_type = {
+static const struct config_item_type midi_func_type = {
         .ct_item_ops    = &midi_item_ops,
         .ct_attrs       = midi_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 87d4e7767f96..c5bce8e22983 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1564,7 +1564,7 @@ static struct configfs_attribute *ncm_attrs[] = {
         NULL,
 };
 
-static struct config_item_type ncm_func_type = {
+static const struct config_item_type ncm_func_type = {
         .ct_item_ops    = &ncm_item_ops,
         .ct_attrs       = ncm_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
index 082f948aa7fd..55b7f57d2dc7 100644
--- a/drivers/usb/gadget/function/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -407,7 +407,7 @@ static struct configfs_attribute *acm_attrs[] = {
         NULL,
 };
 
-static struct config_item_type obex_func_type = {
+static const struct config_item_type obex_func_type = {
         .ct_item_ops    = &obex_item_ops,
         .ct_attrs       = acm_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index 2d867b1ffb47..7889bcc0509a 100644
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -598,7 +598,7 @@ static struct configfs_attribute *phonet_attrs[] = {
         NULL,
 };
 
-static struct config_item_type phonet_func_type = {
+static const struct config_item_type phonet_func_type = {
         .ct_item_ops    = &phonet_item_ops,
         .ct_attrs       = phonet_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index 587575453f48..dd607b99eb1d 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1257,7 +1257,7 @@ static struct configfs_attribute *printer_attrs[] = {
         NULL,
 };
 
-static struct config_item_type printer_func_type = {
+static const struct config_item_type printer_func_type = {
         .ct_item_ops    = &printer_item_ops,
         .ct_attrs       = printer_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index 9c5bf92c4617..d48df36622b7 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -886,7 +886,7 @@ static struct configfs_attribute *rndis_attrs[] = {
         NULL,
 };
 
-static struct config_item_type rndis_func_type = {
+static const struct config_item_type rndis_func_type = {
         .ct_item_ops    = &rndis_item_ops,
         .ct_attrs       = rndis_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index a41fb83e353e..c860f30a0ea2 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -278,7 +278,7 @@ static struct configfs_attribute *acm_attrs[] = {
         NULL,
 };
 
-static struct config_item_type serial_func_type = {
+static const struct config_item_type serial_func_type = {
         .ct_item_ops    = &serial_item_ops,
         .ct_attrs       = acm_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index 39757dd04744..9cdef108fb1b 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -1226,7 +1226,7 @@ static struct configfs_attribute *ss_attrs[] = {
         NULL,
 };
 
-static struct config_item_type ss_func_type = {
+static const struct config_item_type ss_func_type = {
         .ct_item_ops    = &ss_item_ops,
         .ct_attrs       = ss_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index a52d17a69977..4d945254905d 100644
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -408,7 +408,7 @@ static struct configfs_attribute *gether_attrs[] = {
         NULL,
 };
 
-static struct config_item_type gether_func_type = {
+static const struct config_item_type gether_func_type = {
         .ct_item_ops    = &gether_item_ops,
         .ct_attrs       = gether_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 28cb53de51b8..da81cf16b850 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -2167,7 +2167,7 @@ static struct configfs_item_operations tcm_item_ops = {
         .release                = tcm_attr_release,
 };
 
-static struct config_item_type tcm_func_type = {
+static const struct config_item_type tcm_func_type = {
         .ct_item_ops    = &tcm_item_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 91e3f3e6bf78..2746a926a8d9 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -705,7 +705,7 @@ static struct configfs_attribute *f_uac1_attrs[] = {
         NULL,
 };
 
-static struct config_item_type f_uac1_func_type = {
+static const struct config_item_type f_uac1_func_type = {
         .ct_item_ops    = &f_uac1_item_ops,
         .ct_attrs       = f_uac1_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
index 8bd6f6e8d24a..04f4b2862256 100644
--- a/drivers/usb/gadget/function/f_uac1_legacy.c
+++ b/drivers/usb/gadget/function/f_uac1_legacy.c
@@ -920,7 +920,7 @@ static struct configfs_attribute *f_uac1_attrs[] = {
         NULL,
 };
 
-static struct config_item_type f_uac1_func_type = {
+static const struct config_item_type f_uac1_func_type = {
         .ct_item_ops    = &f_uac1_item_ops,
         .ct_attrs       = f_uac1_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index 9dc33a70db33..11fe788b4308 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -917,7 +917,7 @@ static struct configfs_attribute *f_uac2_attrs[] = {
         NULL,
 };
 
-static struct config_item_type f_uac2_func_type = {
+static const struct config_item_type f_uac2_func_type = {
         .ct_item_ops    = &f_uac2_item_ops,
         .ct_attrs       = f_uac2_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index d2ad1442769a..c9b8cc4aae5a 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -124,7 +124,7 @@ static struct configfs_attribute *uvcg_control_header_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_control_header_type = {
+static const struct config_item_type uvcg_control_header_type = {
         .ct_attrs       = uvcg_control_header_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -167,7 +167,7 @@ static struct configfs_group_operations uvcg_control_header_grp_ops = {
         .drop_item              = uvcg_control_header_drop,
 };
 
-static struct config_item_type uvcg_control_header_grp_type = {
+static const struct config_item_type uvcg_control_header_grp_type = {
         .ct_group_ops   = &uvcg_control_header_grp_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -262,7 +262,7 @@ static struct configfs_attribute *uvcg_default_processing_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_default_processing_type = {
+static const struct config_item_type uvcg_default_processing_type = {
         .ct_attrs       = uvcg_default_processing_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -274,7 +274,7 @@ static struct uvcg_processing_grp {
         struct config_group     group;
 } uvcg_processing_grp;
 
-static struct config_item_type uvcg_processing_grp_type = {
+static const struct config_item_type uvcg_processing_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -379,7 +379,7 @@ static struct configfs_attribute *uvcg_default_camera_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_default_camera_type = {
+static const struct config_item_type uvcg_default_camera_type = {
         .ct_attrs       = uvcg_default_camera_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -391,7 +391,7 @@ static struct uvcg_camera_grp {
         struct config_group     group;
 } uvcg_camera_grp;
 
-static struct config_item_type uvcg_camera_grp_type = {
+static const struct config_item_type uvcg_camera_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -457,7 +457,7 @@ static struct configfs_attribute *uvcg_default_output_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_default_output_type = {
+static const struct config_item_type uvcg_default_output_type = {
         .ct_attrs       = uvcg_default_output_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -469,7 +469,7 @@ static struct uvcg_output_grp {
         struct config_group     group;
 } uvcg_output_grp;
 
-static struct config_item_type uvcg_output_grp_type = {
+static const struct config_item_type uvcg_output_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -478,7 +478,7 @@ static struct uvcg_terminal_grp {
         struct config_group     group;
 } uvcg_terminal_grp;
 
-static struct config_item_type uvcg_terminal_grp_type = {
+static const struct config_item_type uvcg_terminal_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -583,7 +583,7 @@ static struct configfs_item_operations uvcg_control_class_item_ops = {
         .drop_link      = uvcg_control_class_drop_link,
 };
 
-static struct config_item_type uvcg_control_class_type = {
+static const struct config_item_type uvcg_control_class_type = {
         .ct_item_ops    = &uvcg_control_class_item_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -593,7 +593,7 @@ static struct uvcg_control_class_grp {
         struct config_group     group;
 } uvcg_control_class_grp;
 
-static struct config_item_type uvcg_control_class_grp_type = {
+static const struct config_item_type uvcg_control_class_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -602,7 +602,7 @@ static struct uvcg_control_grp {
         struct config_group     group;
 } uvcg_control_grp;
 
-static struct config_item_type uvcg_control_grp_type = {
+static const struct config_item_type uvcg_control_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -854,7 +854,7 @@ static struct configfs_attribute *uvcg_streaming_header_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_streaming_header_type = {
+static const struct config_item_type uvcg_streaming_header_type = {
         .ct_item_ops    = &uvcg_streaming_header_item_ops,
         .ct_attrs       = uvcg_streaming_header_attrs,
         .ct_owner       = THIS_MODULE,
@@ -898,7 +898,7 @@ static struct configfs_group_operations uvcg_streaming_header_grp_ops = {
         .drop_item              = uvcg_streaming_header_drop,
 };
 
-static struct config_item_type uvcg_streaming_header_grp_type = {
+static const struct config_item_type uvcg_streaming_header_grp_type = {
         .ct_group_ops   = &uvcg_streaming_header_grp_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -1147,7 +1147,7 @@ static struct configfs_attribute *uvcg_frame_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_frame_type = {
+static const struct config_item_type uvcg_frame_type = {
         .ct_attrs       = uvcg_frame_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -1416,7 +1416,7 @@ static struct configfs_attribute *uvcg_uncompressed_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_uncompressed_type = {
+static const struct config_item_type uvcg_uncompressed_type = {
         .ct_group_ops   = &uvcg_uncompressed_group_ops,
         .ct_attrs       = uvcg_uncompressed_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1466,7 +1466,7 @@ static struct configfs_group_operations uvcg_uncompressed_grp_ops = {
         .drop_item              = uvcg_uncompressed_drop,
 };
 
-static struct config_item_type uvcg_uncompressed_grp_type = {
+static const struct config_item_type uvcg_uncompressed_grp_type = {
         .ct_group_ops   = &uvcg_uncompressed_grp_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -1616,7 +1616,7 @@ static struct configfs_attribute *uvcg_mjpeg_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_mjpeg_type = {
+static const struct config_item_type uvcg_mjpeg_type = {
         .ct_group_ops   = &uvcg_mjpeg_group_ops,
         .ct_attrs       = uvcg_mjpeg_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1660,7 +1660,7 @@ static struct configfs_group_operations uvcg_mjpeg_grp_ops = {
         .drop_item              = uvcg_mjpeg_drop,
 };
 
-static struct config_item_type uvcg_mjpeg_grp_type = {
+static const struct config_item_type uvcg_mjpeg_grp_type = {
         .ct_group_ops   = &uvcg_mjpeg_grp_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -1725,7 +1725,7 @@ static struct configfs_attribute *uvcg_default_color_matching_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvcg_default_color_matching_type = {
+static const struct config_item_type uvcg_default_color_matching_type = {
         .ct_attrs       = uvcg_default_color_matching_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -1737,7 +1737,7 @@ static struct uvcg_color_matching_grp {
         struct config_group     group;
 } uvcg_color_matching_grp;
 
-static struct config_item_type uvcg_color_matching_grp_type = {
+static const struct config_item_type uvcg_color_matching_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -2082,7 +2082,7 @@ static struct configfs_item_operations uvcg_streaming_class_item_ops = {
         .drop_link      = uvcg_streaming_class_drop_link,
 };
 
-static struct config_item_type uvcg_streaming_class_type = {
+static const struct config_item_type uvcg_streaming_class_type = {
         .ct_item_ops    = &uvcg_streaming_class_item_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -2092,7 +2092,7 @@ static struct uvcg_streaming_class_grp {
         struct config_group     group;
 } uvcg_streaming_class_grp;
 
-static struct config_item_type uvcg_streaming_class_grp_type = {
+static const struct config_item_type uvcg_streaming_class_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -2101,7 +2101,7 @@ static struct uvcg_streaming_grp {
         struct config_group     group;
 } uvcg_streaming_grp;
 
-static struct config_item_type uvcg_streaming_grp_type = {
+static const struct config_item_type uvcg_streaming_grp_type = {
         .ct_owner = THIS_MODULE,
 };
 
@@ -2187,7 +2187,7 @@ static struct configfs_attribute *uvc_attrs[] = {
         NULL,
 };
 
-static struct config_item_type uvc_func_type = {
+static const struct config_item_type uvc_func_type = {
         .ct_item_ops    = &uvc_item_ops,
         .ct_attrs       = uvc_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 56fb26127fef..577cff24707b 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -584,7 +584,7 @@ static void detach_attrs(struct config_item * item)
 
 static int populate_attrs(struct config_item *item)
 {
-        struct config_item_type *t = item->ci_type;
+        const struct config_item_type *t = item->ci_type;
         struct configfs_attribute *attr;
         struct configfs_bin_attribute *bin_attr;
         int error = 0;
@@ -901,7 +901,7 @@ static void configfs_detach_group(struct config_item *item)
 static void client_disconnect_notify(struct config_item *parent_item,
                                      struct config_item *item)
 {
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         type = parent_item->ci_type;
         BUG_ON(!type);
@@ -920,7 +920,7 @@ static void client_disconnect_notify(struct config_item *parent_item,
 static void client_drop_item(struct config_item *parent_item,
                              struct config_item *item)
 {
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         type = parent_item->ci_type;
         BUG_ON(!type);
@@ -1260,7 +1260,7 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
         struct config_item *parent_item;
         struct configfs_subsystem *subsys;
         struct configfs_dirent *sd;
-        struct config_item_type *type;
+        const struct config_item_type *type;
         struct module *subsys_owner = NULL, *new_item_owner = NULL;
         char *name;
 
@@ -1810,7 +1810,7 @@ EXPORT_SYMBOL(configfs_unregister_group);
 struct config_group *
 configfs_register_default_group(struct config_group *parent_group,
                                 const char *name,
-                                struct config_item_type *item_type)
+                                const struct config_item_type *item_type)
 {
         int ret;
         struct config_group *group;
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 39da1103d341..62580dba3552 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -166,7 +166,7 @@ configfs_read_bin_file(struct file *file, char __user *buf,
                 retval = -ETXTBSY;
                 goto out;
         }
-        buffer->read_in_progress = 1;
+        buffer->read_in_progress = true;
 
         if (buffer->needs_read_fill) {
                 /* perform first read with buf == NULL to get extent */
@@ -325,7 +325,7 @@ configfs_write_bin_file(struct file *file, const char __user *buf,
                 len = -ETXTBSY;
                 goto out;
         }
-        buffer->write_in_progress = 1;
+        buffer->write_in_progress = true;
 
         /* buffer grows? */
         if (*ppos + count > buffer->bin_buffer_size) {
@@ -429,8 +429,8 @@ static int check_perm(struct inode * inode, struct file * file, int type)
         }
         mutex_init(&buffer->mutex);
         buffer->needs_read_fill = 1;
-        buffer->read_in_progress = 0;
-        buffer->write_in_progress = 0;
+        buffer->read_in_progress = false;
+        buffer->write_in_progress = false;
         buffer->ops = ops;
         file->private_data = buffer;
         goto Done;
@@ -488,10 +488,10 @@ static int configfs_release_bin_file(struct inode *inode, struct file *filp)
         ssize_t len = 0;
         int ret;
 
-        buffer->read_in_progress = 0;
+        buffer->read_in_progress = false;
 
         if (buffer->write_in_progress) {
-                buffer->write_in_progress = 0;
+                buffer->write_in_progress = false;
 
                 len = bin_attr->write(item, buffer->bin_buffer,
                                 buffer->bin_buffer_size);
diff --git a/fs/configfs/item.c b/fs/configfs/item.c
index a66f6624d899..88f266efc09b 100644
--- a/fs/configfs/item.c
+++ b/fs/configfs/item.c
@@ -113,7 +113,7 @@ EXPORT_SYMBOL(config_item_set_name);
 
 void config_item_init_type_name(struct config_item *item,
                                 const char *name,
-                                struct config_item_type *type)
+                                const struct config_item_type *type)
 {
         config_item_set_name(item, "%s", name);
         item->ci_type = type;
@@ -122,7 +122,7 @@ void config_item_init_type_name(struct config_item *item,
 EXPORT_SYMBOL(config_item_init_type_name);
 
 void config_group_init_type_name(struct config_group *group, const char *name,
-                         struct config_item_type *type)
+                         const struct config_item_type *type)
 {
         config_item_set_name(&group->cg_item, "%s", name);
         group->cg_item.ci_type = type;
@@ -148,7 +148,7 @@ EXPORT_SYMBOL(config_item_get_unless_zero);
 
 static void config_item_cleanup(struct config_item *item)
 {
-        struct config_item_type *t = item->ci_type;
+        const struct config_item_type *t = item->ci_type;
         struct config_group *s = item->ci_group;
         struct config_item *parent = item->ci_parent;
 
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index c8aabba502f6..78ffc2699993 100644
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -138,7 +138,7 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
         struct configfs_dirent *sd;
         struct config_item *parent_item;
         struct config_item *target_item = NULL;
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         sd = dentry->d_parent->d_fsdata;
         /*
@@ -186,7 +186,7 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
         struct configfs_dirent *sd = dentry->d_fsdata;
         struct configfs_symlink *sl;
         struct config_item *parent_item;
-        struct config_item_type *type;
+        const struct config_item_type *type;
         int ret;
 
         ret = -EPERM;  /* What lack-of-symlink returns */
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 7211e826d90d..1270551d24e3 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -282,44 +282,44 @@ static struct configfs_item_operations node_ops = {
         .release = release_node,
 };
 
-static struct config_item_type clusters_type = {
+static const struct config_item_type clusters_type = {
         .ct_group_ops = &clusters_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type cluster_type = {
+static const struct config_item_type cluster_type = {
         .ct_item_ops = &cluster_ops,
         .ct_attrs = cluster_attrs,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type spaces_type = {
+static const struct config_item_type spaces_type = {
         .ct_group_ops = &spaces_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type space_type = {
+static const struct config_item_type space_type = {
         .ct_item_ops = &space_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type comms_type = {
+static const struct config_item_type comms_type = {
         .ct_group_ops = &comms_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type comm_type = {
+static const struct config_item_type comm_type = {
         .ct_item_ops = &comm_ops,
         .ct_attrs = comm_attrs,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type nodes_type = {
+static const struct config_item_type nodes_type = {
         .ct_group_ops = &nodes_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type node_type = {
+static const struct config_item_type node_type = {
         .ct_item_ops = &node_ops,
         .ct_attrs = node_attrs,
         .ct_owner = THIS_MODULE,
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index d0206042d068..ea8c551bcd7e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2025,7 +2025,7 @@ static struct configfs_item_operations o2hb_region_item_ops = {
         .release                = o2hb_region_release,
 };
 
-static struct config_item_type o2hb_region_type = {
+static const struct config_item_type o2hb_region_type = {
         .ct_item_ops    = &o2hb_region_item_ops,
         .ct_attrs       = o2hb_region_attrs,
         .ct_owner       = THIS_MODULE,
@@ -2310,7 +2310,7 @@ static struct configfs_group_operations o2hb_heartbeat_group_group_ops = {
         .drop_item      = o2hb_heartbeat_group_drop_item,
 };
 
-static struct config_item_type o2hb_heartbeat_group_type = {
+static const struct config_item_type o2hb_heartbeat_group_type = {
         .ct_group_ops   = &o2hb_heartbeat_group_group_ops,
         .ct_attrs       = o2hb_heartbeat_group_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index b17d180bdc16..a51200ece93d 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -378,7 +378,7 @@ static struct configfs_item_operations o2nm_node_item_ops = {
         .release                = o2nm_node_release,
 };
 
-static struct config_item_type o2nm_node_type = {
+static const struct config_item_type o2nm_node_type = {
         .ct_item_ops    = &o2nm_node_item_ops,
         .ct_attrs       = o2nm_node_attrs,
         .ct_owner       = THIS_MODULE,
@@ -619,7 +619,7 @@ static struct configfs_group_operations o2nm_node_group_group_ops = {
         .drop_item      = o2nm_node_group_drop_item,
 };
 
-static struct config_item_type o2nm_node_group_type = {
+static const struct config_item_type o2nm_node_group_type = {
         .ct_group_ops   = &o2nm_node_group_group_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -637,7 +637,7 @@ static struct configfs_item_operations o2nm_cluster_item_ops = {
         .release        = o2nm_cluster_release,
 };
 
-static struct config_item_type o2nm_cluster_type = {
+static const struct config_item_type o2nm_cluster_type = {
         .ct_item_ops    = &o2nm_cluster_item_ops,
         .ct_attrs       = o2nm_cluster_attrs,
         .ct_owner       = THIS_MODULE,
@@ -722,7 +722,7 @@ static struct configfs_group_operations o2nm_cluster_group_group_ops = {
         .drop_item      = o2nm_cluster_group_drop_item,
 };
 
-static struct config_item_type o2nm_cluster_group_type = {
+static const struct config_item_type o2nm_cluster_group_type = {
         .ct_group_ops   = &o2nm_cluster_group_group_ops,
         .ct_owner       = THIS_MODULE,
 };
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index c96709049683..90b90f8baf99 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -58,7 +58,7 @@ struct config_item {
         struct list_head        ci_entry;
         struct config_item      *ci_parent;
         struct config_group     *ci_group;
-        struct config_item_type *ci_type;
+        const struct config_item_type   *ci_type;
         struct dentry           *ci_dentry;
 };
 
@@ -72,7 +72,7 @@ static inline char *config_item_name(struct config_item * item)
 
 extern void config_item_init_type_name(struct config_item *item,
                                        const char *name,
-                                       struct config_item_type *type);
+                                       const struct config_item_type *type);
 
 extern struct config_item *config_item_get(struct config_item *);
 extern struct config_item *config_item_get_unless_zero(struct config_item *);
@@ -101,7 +101,7 @@ struct config_group {
 extern void config_group_init(struct config_group *group);
 extern void config_group_init_type_name(struct config_group *group,
                                         const char *name,
-                                        struct config_item_type *type);
+                                        const struct config_item_type *type);
 
 static inline struct config_group *to_config_group(struct config_item *item)
 {
@@ -261,7 +261,7 @@ void configfs_remove_default_groups(struct config_group *group);
 struct config_group *
 configfs_register_default_group(struct config_group *parent_group,
                                 const char *name,
-                                struct config_item_type *item_type);
+                                const struct config_item_type *item_type);
 void configfs_unregister_default_group(struct config_group *group);
 
 /* These functions can sleep and can alloc with GFP_KERNEL */
diff --git a/include/linux/iio/sw_device.h b/include/linux/iio/sw_device.h
index fa7931933067..8642b91a7577 100644
--- a/include/linux/iio/sw_device.h
+++ b/include/linux/iio/sw_device.h
@@ -60,7 +60,7 @@ void iio_sw_device_type_configfs_unregister(struct iio_sw_device_type *dt);
 static inline
 void iio_swd_group_init_type_name(struct iio_sw_device *d,
                                   const char *name,
-                                  struct config_item_type *type)
+                                  const struct config_item_type *type)
 {
 #if IS_ENABLED(CONFIG_CONFIGFS_FS)
         config_group_init_type_name(&d->group, name, type);
diff --git a/include/linux/iio/sw_trigger.h b/include/linux/iio/sw_trigger.h
index c97eab67558f..0c43738a9e24 100644
--- a/include/linux/iio/sw_trigger.h
+++ b/include/linux/iio/sw_trigger.h
@@ -60,7 +60,7 @@ void iio_sw_trigger_type_configfs_unregister(struct iio_sw_trigger_type *tt);
 static inline
 void iio_swt_group_init_type_name(struct iio_sw_trigger *t,
                                   const char *name,
-                                  struct config_item_type *type)
+                                  const struct config_item_type *type)
 {
 #if IS_ENABLED(CONFIG_CONFIGFS_FS)
         config_group_init_type_name(&t->group, name, type);
diff --git a/include/target/iscsi/iscsi_target_stat.h b/include/target/iscsi/iscsi_target_stat.h
index b77d579e3ecf..4d75a2c426ca 100644
--- a/include/target/iscsi/iscsi_target_stat.h
+++ b/include/target/iscsi/iscsi_target_stat.h
@@ -9,16 +9,16 @@
 /*
  * For struct iscsi_tiqn->tiqn_wwn default groups
  */
-extern struct config_item_type iscsi_stat_instance_cit;
-extern struct config_item_type iscsi_stat_sess_err_cit;
-extern struct config_item_type iscsi_stat_tgt_attr_cit;
-extern struct config_item_type iscsi_stat_login_cit;
-extern struct config_item_type iscsi_stat_logout_cit;
+extern const struct config_item_type iscsi_stat_instance_cit;
+extern const struct config_item_type iscsi_stat_sess_err_cit;
+extern const struct config_item_type iscsi_stat_tgt_attr_cit;
+extern const struct config_item_type iscsi_stat_login_cit;
+extern const struct config_item_type iscsi_stat_logout_cit;
 
 /*
  * For struct iscsi_session->se_sess default groups
  */
-extern struct config_item_type iscsi_stat_sess_cit;
+extern const struct config_item_type iscsi_stat_sess_cit;
 
 /* iSCSI session error types */
 #define ISCSI_SESS_ERR_UNKNOWN          0
diff --git a/samples/configfs/configfs_sample.c b/samples/configfs/configfs_sample.c
index 1ea33119e532..004a4e201476 100644
--- a/samples/configfs/configfs_sample.c
+++ b/samples/configfs/configfs_sample.c
@@ -115,7 +115,7 @@ static struct configfs_attribute *childless_attrs[] = {
         NULL,
 };
 
-static struct config_item_type childless_type = {
+static const struct config_item_type childless_type = {
         .ct_attrs       = childless_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -193,7 +193,7 @@ static struct configfs_item_operations simple_child_item_ops = {
         .release                = simple_child_release,
 };
 
-static struct config_item_type simple_child_type = {
+static const struct config_item_type simple_child_type = {
         .ct_item_ops    = &simple_child_item_ops,
         .ct_attrs       = simple_child_attrs,
         .ct_owner       = THIS_MODULE,
@@ -261,7 +261,7 @@ static struct configfs_group_operations simple_children_group_ops = {
         .make_item      = simple_children_make_item,
 };
 
-static struct config_item_type simple_children_type = {
+static const struct config_item_type simple_children_type = {
         .ct_item_ops    = &simple_children_item_ops,
         .ct_group_ops   = &simple_children_group_ops,
         .ct_attrs       = simple_children_attrs,
@@ -331,7 +331,7 @@ static struct configfs_group_operations group_children_group_ops = {
         .make_group     = group_children_make_group,
 };
 
-static struct config_item_type group_children_type = {
+static const struct config_item_type group_children_type = {
         .ct_group_ops   = &group_children_group_ops,
         .ct_attrs       = group_children_attrs,
         .ct_owner       = THIS_MODULE,