Commit b68cf5e3 authored by Aristeu Sergio Rozanski Filho's avatar Aristeu Sergio Rozanski Filho Committed by James Bottomley

[PATCH] qlogicfas: use a static string as name

parent 4cc930d9
...@@ -161,6 +161,8 @@ static int qlcfg8 = (SLOWCABLE << 7) | (QL_ENABLE_PARITY << 4); ...@@ -161,6 +161,8 @@ static int qlcfg8 = (SLOWCABLE << 7) | (QL_ENABLE_PARITY << 4);
static int qlcfg9 = ((XTALFREQ + 4) / 5); static int qlcfg9 = ((XTALFREQ + 4) / 5);
static int qlcfgc = (FASTCLK << 3) | (FASTSCSI << 4); static int qlcfgc = (FASTCLK << 3) | (FASTSCSI << 4);
static char qlogicfas_name[] = "qlogicfas";
int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
...@@ -609,7 +611,7 @@ struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host) ...@@ -609,7 +611,7 @@ struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host)
if (!qbase) { if (!qbase) {
for (qbase = 0x230; qbase < 0x430; qbase += 0x100) { for (qbase = 0x230; qbase < 0x430; qbase += 0x100) {
if (!request_region(qbase, 0x10, "qlogicfas")) if (!request_region(qbase, 0x10, qlogicfas_name))
continue; continue;
REG1; REG1;
if (((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7) if (((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7)
...@@ -668,7 +670,7 @@ struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host) ...@@ -668,7 +670,7 @@ struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host)
} else } else
printk(KERN_INFO "Ql: Using preset IRQ %d\n", qlirq); 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; host->can_queue = 1;
#endif #endif
hreg = scsi_register(host, 0); /* no host data */ hreg = scsi_register(host, 0); /* no host data */
...@@ -796,8 +798,8 @@ MODULE_LICENSE("GPL"); ...@@ -796,8 +798,8 @@ MODULE_LICENSE("GPL");
*/ */
Scsi_Host_Template qlogicfas_driver_template = { Scsi_Host_Template qlogicfas_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "qlogicfas", .name = qlogicfas_name,
.proc_name = "qlogicfas", .proc_name = qlogicfas_name,
.detect = qlogicfas_detect, .detect = qlogicfas_detect,
.release = qlogicfas_release, .release = qlogicfas_release,
.info = qlogicfas_info, .info = qlogicfas_info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment