diff options
| author | Kristian Høgsberg | 2007-05-10 01:23:12 +0200 |
|---|---|---|
| committer | James Bottomley | 2007-07-19 19:06:26 +0200 |
| commit | b02b6bc46571b21a545c9e697df1e226ff22bc81 (patch) | |
| tree | 4088bb8494b057ecbee2a360556eb90600121755 | |
| parent | [SCSI] zfcp: code cleanup (diff) | |
| download | kernel-qcow2-linux-b02b6bc46571b21a545c9e697df1e226ff22bc81.tar.gz kernel-qcow2-linux-b02b6bc46571b21a545c9e697df1e226ff22bc81.tar.xz kernel-qcow2-linux-b02b6bc46571b21a545c9e697df1e226ff22bc81.zip | |
[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>
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 2 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 2 |
3 files changed, 3 insertions, 3 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[] = { 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 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) 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 ba07cf7c04ba..3b8a6a85c2f8 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 |