diff --git a/qla2x00t/qla_def.h b/qla2x00t/qla_def.h
index 31d4e79ca..6991e9016 100644
--- a/qla2x00t/qla_def.h
+++ b/qla2x00t/qla_def.h
@@ -1796,7 +1796,7 @@ typedef struct fc_port {
 #define FCS_DEVICE_LOST		3
 #define FCS_ONLINE		4
 
-static const char *port_state_str[] = {
+static const char *const port_state_str[] = {
 	"Unknown",
 	"UNCONFIGURED",
 	"DEAD",
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 613259b94..d6bd52239 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -9871,7 +9871,7 @@ static const struct attribute *vdisk_fileio_attrs[] = {
 	NULL,
 };
 
-static const char *fileio_add_dev_params[] = {
+static const char *const fileio_add_dev_params[] = {
 	"async",
 	"blocksize",
 	"cluster_mode",
@@ -9962,7 +9962,7 @@ static const struct attribute *vdisk_blockio_attrs[] = {
 	NULL,
 };
 
-static const char *blockio_add_dev_params[] = {
+static const char *const blockio_add_dev_params[] = {
 	"active",
 	"bind_alua_state",
 	"blocksize",
@@ -10038,7 +10038,7 @@ static const struct attribute *vdisk_nullio_attrs[] = {
 	NULL,
 };
 
-static const char *nullio_add_dev_params[] = {
+static const char *const nullio_add_dev_params[] = {
 	"blocksize",
 	"cluster_mode",
 	"dif_mode",