aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-09-09 08:56:40 -0600
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:48:19 -0400
commit01fbfe0b8359695a3ff7f4b79ab1e0a777f10ae4 (patch)
tree853bd084504ab2ff04acc4ec29f531f76e5b5475 /drivers/scsi
parent95c9f16284960f579205d7da8b5d90e2f3bf44a7 (diff)
[SCSI] advansys: Use DRV_NAME
Follow the example of some other drivers by defining DRV_NAME to be "advansys". Prevents spelling mistakes. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/advansys.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index e5b26a1ea0e..0303fc7dacd 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -1,3 +1,4 @@
+#define DRV_NAME "advansys"
#define ASC_VERSION "3.4" /* AdvanSys Driver Version */
/*
@@ -3213,11 +3214,11 @@ advansys_biosparam(struct scsi_device *sdev, struct block_device *bdev,
}
static struct scsi_host_template advansys_template = {
- .proc_name = "advansys",
+ .proc_name = DRV_NAME,
#ifdef CONFIG_PROC_FS
.proc_info = advansys_proc_info,
#endif
- .name = "advansys",
+ .name = DRV_NAME,
.info = advansys_info,
.queuecommand = advansys_queuecommand,
.eh_bus_reset_handler = advansys_reset,
@@ -14634,7 +14635,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)
/* Register DMA channel for ISA bus. */
if (asc_dvc_varp->bus_type & ASC_IS_ISA) {
shost->dma_channel = asc_dvc_varp->cfg->isa_dma_channel;
- ret = request_dma(shost->dma_channel, "advansys");
+ ret = request_dma(shost->dma_channel, DRV_NAME);
if (ret) {
ASC_PRINT3
("advansys_board_found: board %d: request_dma() %d failed %d\n",
@@ -14650,7 +14651,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)
ASC_DBG1(2, "advansys_board_found: request_irq() %d\n", shost->irq);
ret = request_irq(shost->irq, advansys_interrupt, share_irq,
- "advansys", shost);
+ DRV_NAME, shost);
if (ret) {
if (ret == -EBUSY) {
@@ -14754,7 +14755,7 @@ static int __devinit advansys_isa_probe(struct device *dev, unsigned int id)
PortAddr iop_base = _asc_def_iop_base[id];
struct Scsi_Host *shost;
- if (!request_region(iop_base, ASC_IOADR_GAP, "advansys")) {
+ if (!request_region(iop_base, ASC_IOADR_GAP, DRV_NAME)) {
ASC_DBG1(1, "advansys_isa_match: I/O port 0x%x busy\n",
iop_base);
return -ENODEV;
@@ -14790,7 +14791,7 @@ static struct isa_driver advansys_isa_driver = {
.remove = __devexit_p(advansys_isa_remove),
.driver = {
.owner = THIS_MODULE,
- .name = "advansys",
+ .name = DRV_NAME,
},
};
@@ -14799,7 +14800,7 @@ static int __devinit advansys_vlb_probe(struct device *dev, unsigned int id)
PortAddr iop_base = _asc_def_iop_base[id];
struct Scsi_Host *shost;
- if (!request_region(iop_base, ASC_IOADR_GAP, "advansys")) {
+ if (!request_region(iop_base, ASC_IOADR_GAP, DRV_NAME)) {
ASC_DBG1(1, "advansys_vlb_match: I/O port 0x%x busy\n",
iop_base);
return -ENODEV;
@@ -14867,7 +14868,7 @@ static int __devinit advansys_eisa_probe(struct device *dev)
err = -ENODEV;
for (i = 0; i < 2; i++, ioport += 0x20) {
- if (!request_region(ioport, ASC_IOADR_GAP, "advansys")) {
+ if (!request_region(ioport, ASC_IOADR_GAP, DRV_NAME)) {
printk(KERN_WARNING "Region %x-%x busy\n", ioport,
ioport + ASC_IOADR_GAP - 1);
continue;
@@ -14925,7 +14926,7 @@ static __devexit int advansys_eisa_remove(struct device *dev)
static struct eisa_driver advansys_eisa_driver = {
.id_table = advansys_eisa_table,
.driver = {
- .name = "advansys",
+ .name = DRV_NAME,
.probe = advansys_eisa_probe,
.remove = __devexit_p(advansys_eisa_remove),
}
@@ -14972,7 +14973,7 @@ advansys_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = pci_enable_device(pdev);
if (err)
goto fail;
- err = pci_request_regions(pdev, "advansys");
+ err = pci_request_regions(pdev, DRV_NAME);
if (err)
goto disable_device;
pci_set_master(pdev);
@@ -15007,7 +15008,7 @@ static void __devexit advansys_pci_remove(struct pci_dev *pdev)
}
static struct pci_driver advansys_pci_driver = {
- .name = "advansys",
+ .name = DRV_NAME,
.id_table = advansys_pci_tbl,
.probe = advansys_pci_probe,
.remove = __devexit_p(advansys_pci_remove),