Commit b02b6bc4 authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by James Bottomley

[SCSI] Make scsi_host_template::proc_name const char * instead of char *.

Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>

collapsed with fw-sbp2 patch "Drop cast to non-const char * in host
template initialization." from Kristian Høgsberg
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b4e44590
...@@ -1162,7 +1162,7 @@ static struct device_attribute *sbp2_scsi_sysfs_attrs[] = { ...@@ -1162,7 +1162,7 @@ static struct device_attribute *sbp2_scsi_sysfs_attrs[] = {
static struct scsi_host_template scsi_driver_template = { static struct scsi_host_template scsi_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "SBP-2 IEEE-1394", .name = "SBP-2 IEEE-1394",
.proc_name = (char *)sbp2_driver_name, .proc_name = sbp2_driver_name,
.queuecommand = sbp2_scsi_queuecommand, .queuecommand = sbp2_scsi_queuecommand,
.slave_alloc = sbp2_scsi_slave_alloc, .slave_alloc = sbp2_scsi_slave_alloc,
.slave_configure = sbp2_scsi_slave_configure, .slave_configure = sbp2_scsi_slave_configure,
......
...@@ -2875,7 +2875,7 @@ static int __init scsi_debug_init(void) ...@@ -2875,7 +2875,7 @@ static int __init scsi_debug_init(void)
init_all_queued(); init_all_queued();
sdebug_driver_template.proc_name = (char *)sdebug_proc_name; sdebug_driver_template.proc_name = sdebug_proc_name;
host_to_add = scsi_debug_add_host; host_to_add = scsi_debug_add_host;
scsi_debug_add_host = 0; scsi_debug_add_host = 0;
......
...@@ -341,7 +341,7 @@ struct scsi_host_template { ...@@ -341,7 +341,7 @@ struct scsi_host_template {
/* /*
* Name of proc directory * Name of proc directory
*/ */
char *proc_name; const char *proc_name;
/* /*
* Used to store the procfs directory if a driver implements the * Used to store the procfs directory if a driver implements the
......
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