aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2006-05-17 18:09:45 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-20 10:49:53 -0400
commitcb63067a772c0149184309a1f232d62c81a93673 (patch)
treea42a6561416022e0d5275369c52f7fba10103552 /drivers
parent47f5e069e4d03dda36e3a13f3e20147efd710340 (diff)
[SCSI] qla2xxx: Consolidate "qla2xxx" string usage to a #define.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c15
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index c4136bf344a4..30a931979889 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -31,6 +31,8 @@
31#include <scsi/scsi_cmnd.h> 31#include <scsi/scsi_cmnd.h>
32#include <scsi/scsi_transport_fc.h> 32#include <scsi/scsi_transport_fc.h>
33 33
34#define QLA2XXX_DRIVER_NAME "qla2xxx"
35
34/* 36/*
35 * We have MAILBOX_REGISTER_COUNT sized arrays in a few places, 37 * We have MAILBOX_REGISTER_COUNT sized arrays in a few places,
36 * but that's fine as we don't look at the last 24 ones for 38 * but that's fine as we don't look at the last 24 ones for
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2f83523e78f2..b6adc8a9d4c8 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -86,7 +86,7 @@ static int qla2x00_change_queue_type(struct scsi_device *, int);
86 86
87static struct scsi_host_template qla2x00_driver_template = { 87static struct scsi_host_template qla2x00_driver_template = {
88 .module = THIS_MODULE, 88 .module = THIS_MODULE,
89 .name = "qla2xxx", 89 .name = QLA2XXX_DRIVER_NAME,
90 .queuecommand = qla2x00_queuecommand, 90 .queuecommand = qla2x00_queuecommand,
91 91
92 .eh_abort_handler = qla2xxx_eh_abort, 92 .eh_abort_handler = qla2xxx_eh_abort,
@@ -115,7 +115,7 @@ static struct scsi_host_template qla2x00_driver_template = {
115 115
116static struct scsi_host_template qla24xx_driver_template = { 116static struct scsi_host_template qla24xx_driver_template = {
117 .module = THIS_MODULE, 117 .module = THIS_MODULE,
118 .name = "qla2xxx", 118 .name = QLA2XXX_DRIVER_NAME,
119 .queuecommand = qla24xx_queuecommand, 119 .queuecommand = qla24xx_queuecommand,
120 120
121 .eh_abort_handler = qla2xxx_eh_abort, 121 .eh_abort_handler = qla2xxx_eh_abort,
@@ -1239,7 +1239,7 @@ qla2x00_iospace_config(scsi_qla_host_t *ha)
1239 goto iospace_error_exit; 1239 goto iospace_error_exit;
1240 } 1240 }
1241 1241
1242 if (pci_request_regions(ha->pdev, "qla2xxx")) { 1242 if (pci_request_regions(ha->pdev, QLA2XXX_DRIVER_NAME)) {
1243 qla_printk(KERN_WARNING, ha, 1243 qla_printk(KERN_WARNING, ha,
1244 "Failed to reserve PIO/MMIO regions (%s)\n", 1244 "Failed to reserve PIO/MMIO regions (%s)\n",
1245 pci_name(ha->pdev)); 1245 pci_name(ha->pdev));
@@ -1355,7 +1355,7 @@ static int qla2x00_probe_one(struct pci_dev *pdev)
1355 ha->pdev = pdev; 1355 ha->pdev = pdev;
1356 ha->host = host; 1356 ha->host = host;
1357 ha->host_no = host->host_no; 1357 ha->host_no = host->host_no;
1358 sprintf(ha->host_str, "qla2xxx_%ld", ha->host_no); 1358 sprintf(ha->host_str, "%s_%ld", QLA2XXX_DRIVER_NAME, ha->host_no);
1359 1359
1360 /* Set ISP-type information. */ 1360 /* Set ISP-type information. */
1361 qla2x00_set_isp_flags(ha); 1361 qla2x00_set_isp_flags(ha);
@@ -1538,7 +1538,7 @@ static int qla2x00_probe_one(struct pci_dev *pdev)
1538 host->transportt = qla2xxx_transport_template; 1538 host->transportt = qla2xxx_transport_template;
1539 1539
1540 ret = request_irq(pdev->irq, ha->isp_ops.intr_handler, 1540 ret = request_irq(pdev->irq, ha->isp_ops.intr_handler,
1541 SA_INTERRUPT|SA_SHIRQ, "qla2xxx", ha); 1541 SA_INTERRUPT|SA_SHIRQ, QLA2XXX_DRIVER_NAME, ha);
1542 if (ret) { 1542 if (ret) {
1543 qla_printk(KERN_WARNING, ha, 1543 qla_printk(KERN_WARNING, ha,
1544 "Failed to reserve interrupt %d already in use.\n", 1544 "Failed to reserve interrupt %d already in use.\n",
@@ -1868,7 +1868,8 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
1868 continue; 1868 continue;
1869 } 1869 }
1870 1870
1871 snprintf(name, sizeof(name), "qla2xxx_%ld", ha->host_no); 1871 snprintf(name, sizeof(name), "%s_%ld", QLA2XXX_DRIVER_NAME,
1872 ha->host_no);
1872 ha->s_dma_pool = dma_pool_create(name, &ha->pdev->dev, 1873 ha->s_dma_pool = dma_pool_create(name, &ha->pdev->dev,
1873 DMA_POOL_SIZE, 8, 0); 1874 DMA_POOL_SIZE, 8, 0);
1874 if (ha->s_dma_pool == NULL) { 1875 if (ha->s_dma_pool == NULL) {
@@ -2631,7 +2632,7 @@ qla2xxx_remove_one(struct pci_dev *pdev)
2631} 2632}
2632 2633
2633static struct pci_driver qla2xxx_pci_driver = { 2634static struct pci_driver qla2xxx_pci_driver = {
2634 .name = "qla2xxx", 2635 .name = QLA2XXX_DRIVER_NAME,
2635 .driver = { 2636 .driver = {
2636 .owner = THIS_MODULE, 2637 .owner = THIS_MODULE,
2637 }, 2638 },