Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/firewire/fw-sbp2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

drivers/scsi/scsi_debug.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

include/scsi/scsi_host.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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