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

Signed-off-by: Kristian 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: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 7c53be0387f..e5e5b0a2b8a 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1162,7 +1162,7 @@ static struct device_attribute *sbp2_scsi_sysfs_attrs[] = {
 static struct scsi_host_template scsi_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = "SBP-2 IEEE-1394",
-        .proc_name              = (char *)sbp2_driver_name,
+        .proc_name              = sbp2_driver_name,
         .queuecommand           = sbp2_scsi_queuecommand,
         .slave_alloc            = sbp2_scsi_slave_alloc,
         .slave_configure        = sbp2_scsi_slave_configure,
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 4cd9c58efef..4947dfe625a 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2875,7 +2875,7 @@ static int __init scsi_debug_init(void)
 
         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;
         scsi_debug_add_host = 0;
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index ba07cf7c04b..3b8a6a85c2f 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -341,7 +341,7 @@ struct scsi_host_template {
         /*
          * Name of proc directory
          */
-        char *proc_name;
+        const char *proc_name;
 
         /*
          * Used to store the procfs directory if a driver implements the