[patch][1/15] qlogicfas: use a static string as name

[patch][1/15] qlogicfas: use a static string as name

[Aristeu Sergio Rozanski Filho]

[-- Attachment #1.1: Type: text/plain, Size: 17 bytes --]



-- 
aris


[-- Attachment #1.2: 01-qlogicfas-use_qlogicfas_name.patch --]
[-- Type: text/plain, Size: 1532 bytes --]

diff -ur linux-2.6.3-applied/drivers/scsi/qlogicfas.c linux-2.6.3-work/drivers/scsi/qlogicfas.c
--- linux-2.6.3-applied/drivers/scsi/qlogicfas.c	2004-03-05 17:53:14.000000000 -0300
+++ linux-2.6.3-work/drivers/scsi/qlogicfas.c	2004-03-05 18:14:34.000000000 -0300
@@ -161,6 +161,8 @@
 static int qlcfg9 = ((XTALFREQ + 4) / 5);
 static int qlcfgc = (FASTCLK << 3) | (FASTSCSI << 4);
 
+static char qlogicfas_name[] = "qlogicfas";
+
 int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
 
 /*----------------------------------------------------------------*/
@@ -609,7 +611,7 @@
 
 	if (!qbase) {
 		for (qbase = 0x230; qbase < 0x430; qbase += 0x100) {
-			if (!request_region(qbase, 0x10, "qlogicfas"))
+			if (!request_region(qbase, 0x10, qlogicfas_name))
 				continue;
 			REG1;
 			if (((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7)
@@ -668,7 +670,7 @@
 	} else
 		printk(KERN_INFO "Ql: Using preset IRQ %d\n", qlirq);
 
-	if (qlirq >= 0 && !request_irq(qlirq, do_ql_ihandl, 0, "qlogicfas", NULL))
+	if (qlirq >= 0 && !request_irq(qlirq, do_ql_ihandl, 0, qlogicfas_name, NULL))
 		host->can_queue = 1;
 #endif
 	hreg = scsi_register(host, 0);	/* no host data */
@@ -796,8 +798,8 @@
  */
 Scsi_Host_Template qlogicfas_driver_template = {
 	.module			= THIS_MODULE,
-	.name			= "qlogicfas",
-	.proc_name		= "qlogicfas",
+	.name			= qlogicfas_name,
+	.proc_name		= qlogicfas_name,
 	.detect			= qlogicfas_detect,
 	.release		= qlogicfas_release,
 	.info			= qlogicfas_info,

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]