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

[PATCH] qlogic_cs: use a static string as name

parent 330a38ab
...@@ -60,6 +60,8 @@ extern void qlogicfas_preset(int port, int irq); ...@@ -60,6 +60,8 @@ extern void qlogicfas_preset(int port, int irq);
extern struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *); extern struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *);
extern int qlogicfas_bus_reset(Scsi_Cmnd *); extern int qlogicfas_bus_reset(Scsi_Cmnd *);
static char *qlogic_name = "qlogic_cs";
#ifdef PCMCIA_DEBUG #ifdef PCMCIA_DEBUG
static int pc_debug = PCMCIA_DEBUG; static int pc_debug = PCMCIA_DEBUG;
MODULE_PARM(pc_debug, "i"); MODULE_PARM(pc_debug, "i");
...@@ -244,9 +246,11 @@ static void qlogic_config(dev_link_t * link) ...@@ -244,9 +246,11 @@ static void qlogic_config(dev_link_t * link)
else else
qlogicfas_preset(link->io.BasePort1, link->irq.AssignedIRQ); qlogicfas_preset(link->io.BasePort1, link->irq.AssignedIRQ);
qlogicfas_driver_template.name = qlogic_name;
qlogicfas_driver_template.proc_name = qlogic_name;
host = __qlogicfas_detect(&qlogicfas_driver_template); host = __qlogicfas_detect(&qlogicfas_driver_template);
if (!host) { if (!host) {
printk(KERN_INFO "qlogic_cs: no SCSI devices found\n"); printk(KERN_INFO "%s: no SCSI devices found\n", qlogic_name);
goto out; goto out;
} }
...@@ -337,7 +341,7 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg ...@@ -337,7 +341,7 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg
static struct pcmcia_driver qlogic_cs_driver = { static struct pcmcia_driver qlogic_cs_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.drv = { .drv = {
.name = "qlogic_cs", .name = "qlogic_cs",
}, },
.attach = qlogic_attach, .attach = qlogic_attach,
.detach = qlogic_detach, .detach = qlogic_detach,
......
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