diff options
author | Kristian Høgsberg <krh@redhat.com> | 2007-05-09 19:23:12 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-19 13:06:26 -0400 |
commit | b02b6bc46571b21a545c9e697df1e226ff22bc81 (patch) | |
tree | 4088bb8494b057ecbee2a360556eb90600121755 /drivers | |
parent | b4e44590f0811e629faf2de4aea15e752d83ce3d (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firewire/fw-sbp2.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_debug.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 7c53be0387fb..e5e5b0a2b8a9 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[] = { | |||
1162 | static struct scsi_host_template scsi_driver_template = { | 1162 | static struct scsi_host_template scsi_driver_template = { |
1163 | .module = THIS_MODULE, | 1163 | .module = THIS_MODULE, |
1164 | .name = "SBP-2 IEEE-1394", | 1164 | .name = "SBP-2 IEEE-1394", |
1165 | .proc_name = (char *)sbp2_driver_name, | 1165 | .proc_name = sbp2_driver_name, |
1166 | .queuecommand = sbp2_scsi_queuecommand, | 1166 | .queuecommand = sbp2_scsi_queuecommand, |
1167 | .slave_alloc = sbp2_scsi_slave_alloc, | 1167 | .slave_alloc = sbp2_scsi_slave_alloc, |
1168 | .slave_configure = sbp2_scsi_slave_configure, | 1168 | .slave_configure = sbp2_scsi_slave_configure, |
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 4cd9c58efef1..4947dfe625a6 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
@@ -2875,7 +2875,7 @@ static int __init scsi_debug_init(void) | |||
2875 | 2875 | ||
2876 | init_all_queued(); | 2876 | init_all_queued(); |
2877 | 2877 | ||
2878 | sdebug_driver_template.proc_name = (char *)sdebug_proc_name; | 2878 | sdebug_driver_template.proc_name = sdebug_proc_name; |
2879 | 2879 | ||
2880 | host_to_add = scsi_debug_add_host; | 2880 | host_to_add = scsi_debug_add_host; |
2881 | scsi_debug_add_host = 0; | 2881 | scsi_debug_add_host = 0; |