Commit 517bcc2b authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Martin K. Petersen

scsi: core: Constify the struct device_type usage

Since commit aed65af1 ("drivers: make device_type const"), the driver
core can properly handle constant struct device_type. Move the
scsi_host_type, scsi_target_type and scsi_dev_type variables to be constant
structures as well, placing it into read-only memory which can not be
modified at runtime.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRicardo B. Marliere <ricardo@marliere.net>
Link: https://lore.kernel.org/r/20240219-device_cleanup-scsi-v1-1-c5edf2afe178@marliere.netSigned-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3e24118e
...@@ -371,7 +371,7 @@ static void scsi_host_dev_release(struct device *dev) ...@@ -371,7 +371,7 @@ static void scsi_host_dev_release(struct device *dev)
kfree(shost); kfree(shost);
} }
static struct device_type scsi_host_type = { static const struct device_type scsi_host_type = {
.name = "scsi_host", .name = "scsi_host",
.release = scsi_host_dev_release, .release = scsi_host_dev_release,
}; };
......
...@@ -412,7 +412,7 @@ static void scsi_target_dev_release(struct device *dev) ...@@ -412,7 +412,7 @@ static void scsi_target_dev_release(struct device *dev)
put_device(parent); put_device(parent);
} }
static struct device_type scsi_target_type = { static const struct device_type scsi_target_type = {
.name = "scsi_target", .name = "scsi_target",
.release = scsi_target_dev_release, .release = scsi_target_dev_release,
}; };
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "scsi_priv.h" #include "scsi_priv.h"
#include "scsi_logging.h" #include "scsi_logging.h"
static struct device_type scsi_dev_type; static const struct device_type scsi_dev_type;
static const struct { static const struct {
enum scsi_device_state value; enum scsi_device_state value;
...@@ -1626,7 +1626,7 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost) ...@@ -1626,7 +1626,7 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost)
return 0; return 0;
} }
static struct device_type scsi_dev_type = { static const struct device_type scsi_dev_type = {
.name = "scsi_device", .name = "scsi_device",
.release = scsi_device_dev_release, .release = scsi_device_dev_release,
.groups = scsi_sdev_attr_groups, .groups = scsi_sdev_attr_groups,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment