aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/advansys.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-09-09 10:56:40 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:48:19 -0400
commit01fbfe0b8359695a3ff7f4b79ab1e0a777f10ae4 (patch)
tree853bd084504ab2ff04acc4ec29f531f76e5b5475 /drivers/scsi/advansys.c
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/advansys.c')
-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 e5b26a1ea0ec..0303fc7dacd3 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -1,3 +1,4 @@
1#define DRV_NAME "advansys"
1#define ASC_VERSION "3.4" /* AdvanSys Driver Version */ 2#define ASC_VERSION "3.4" /* AdvanSys Driver Version */
2 3
3/* 4/*
@@ -3213,11 +3214,11 @@ advansys_biosparam(struct scsi_device *sdev, struct block_device *bdev,
3213} 3214}
3214 3215
3215static struct scsi_host_template advansys_template = { 3216static struct scsi_host_template advansys_template = {
3216 .proc_name = "advansys", 3217 .proc_name = DRV_NAME,
3217#ifdef CONFIG_PROC_FS 3218#ifdef CONFIG_PROC_FS
3218 .proc_info = advansys_proc_info, 3219 .proc_info = advansys_proc_info,
3219#endif 3220#endif
3220 .name = "advansys", 3221 .name = DRV_NAME,
3221 .info = advansys_info, 3222 .info = advansys_info,
3222 .queuecommand = advansys_queuecommand, 3223 .queuecommand = advansys_queuecommand,
3223 .eh_bus_reset_handler = advansys_reset, 3224 .eh_bus_reset_handler = advansys_reset,
@@ -14634,7 +14635,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)
14634 /* Register DMA channel for ISA bus. */ 14635 /* Register DMA channel for ISA bus. */
14635 if (asc_dvc_varp->bus_type & ASC_IS_ISA) { 14636 if (asc_dvc_varp->bus_type & ASC_IS_ISA) {
14636 shost->dma_channel = asc_dvc_varp->cfg->isa_dma_channel; 14637 shost->dma_channel = asc_dvc_varp->cfg->isa_dma_channel;
14637 ret = request_dma(shost->dma_channel, "advansys"); 14638 ret = request_dma(shost->dma_channel, DRV_NAME);
14638 if (ret) { 14639 if (ret) {
14639 ASC_PRINT3 14640 ASC_PRINT3
14640 ("advansys_board_found: board %d: request_dma() %d failed %d\n", 14641 ("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)
14650 ASC_DBG1(2, "advansys_board_found: request_irq() %d\n", shost->irq); 14651 ASC_DBG1(2, "advansys_board_found: request_irq() %d\n", shost->irq);
14651 14652
14652 ret = request_irq(shost->irq, advansys_interrupt, share_irq, 14653 ret = request_irq(shost->irq, advansys_interrupt, share_irq,
14653 "advansys", shost); 14654 DRV_NAME, shost);
14654 14655
14655 if (ret) { 14656 if (ret) {
14656 if (ret == -EBUSY) { 14657 if (ret == -EBUSY) {
@@ -14754,7 +14755,7 @@ static int __devinit advansys_isa_probe(struct device *dev, unsigned int id)
14754 PortAddr iop_base = _asc_def_iop_base[id]; 14755 PortAddr iop_base = _asc_def_iop_base[id];
14755 struct Scsi_Host *shost; 14756 struct Scsi_Host *shost;
14756 14757
14757 if (!request_region(iop_base, ASC_IOADR_GAP, "advansys")) { 14758 if (!request_region(iop_base, ASC_IOADR_GAP, DRV_NAME)) {
14758 ASC_DBG1(1, "advansys_isa_match: I/O port 0x%x busy\n", 14759 ASC_DBG1(1, "advansys_isa_match: I/O port 0x%x busy\n",
14759 iop_base); 14760 iop_base);
14760 return -ENODEV; 14761 return -ENODEV;
@@ -14790,7 +14791,7 @@ static struct isa_driver advansys_isa_driver = {
14790 .remove = __devexit_p(advansys_isa_remove), 14791 .remove = __devexit_p(advansys_isa_remove),
14791 .driver = { 14792 .driver = {
14792 .owner = THIS_MODULE, 14793 .owner = THIS_MODULE,
14793 .name = "advansys", 14794 .name = DRV_NAME,
14794 }, 14795 },
14795}; 14796};
14796 14797
@@ -14799,7 +14800,7 @@ static int __devinit advansys_vlb_probe(struct device *dev, unsigned int id)
14799 PortAddr iop_base = _asc_def_iop_base[id]; 14800 PortAddr iop_base = _asc_def_iop_base[id];
14800 struct Scsi_Host *shost; 14801 struct Scsi_Host *shost;
14801 14802
14802 if (!request_region(iop_base, ASC_IOADR_GAP, "advansys")) { 14803 if (!request_region(iop_base, ASC_IOADR_GAP, DRV_NAME)) {
14803 ASC_DBG1(1, "advansys_vlb_match: I/O port 0x%x busy\n", 14804 ASC_DBG1(1, "advansys_vlb_match: I/O port 0x%x busy\n",
14804 iop_base); 14805 iop_base);
14805 return -ENODEV; 14806 return -ENODEV;
@@ -14867,7 +14868,7 @@ static int __devinit advansys_eisa_probe(struct device *dev)
14867 14868
14868 err = -ENODEV; 14869 err = -ENODEV;
14869 for (i = 0; i < 2; i++, ioport += 0x20) { 14870 for (i = 0; i < 2; i++, ioport += 0x20) {
14870 if (!request_region(ioport, ASC_IOADR_GAP, "advansys")) { 14871 if (!request_region(ioport, ASC_IOADR_GAP, DRV_NAME)) {
14871 printk(KERN_WARNING "Region %x-%x busy\n", ioport, 14872 printk(KERN_WARNING "Region %x-%x busy\n", ioport,
14872 ioport + ASC_IOADR_GAP - 1); 14873 ioport + ASC_IOADR_GAP - 1);
14873 continue; 14874 continue;
@@ -14925,7 +14926,7 @@ static __devexit int advansys_eisa_remove(struct device *dev)
14925static struct eisa_driver advansys_eisa_driver = { 14926static struct eisa_driver advansys_eisa_driver = {
14926 .id_table = advansys_eisa_table, 14927 .id_table = advansys_eisa_table,
14927 .driver = { 14928 .driver = {
14928 .name = "advansys", 14929 .name = DRV_NAME,
14929 .probe = advansys_eisa_probe, 14930 .probe = advansys_eisa_probe,
14930 .remove = __devexit_p(advansys_eisa_remove), 14931 .remove = __devexit_p(advansys_eisa_remove),
14931 } 14932 }
@@ -14972,7 +14973,7 @@ advansys_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
14972 err = pci_enable_device(pdev); 14973 err = pci_enable_device(pdev);
14973 if (err) 14974 if (err)
14974 goto fail; 14975 goto fail;
14975 err = pci_request_regions(pdev, "advansys"); 14976 err = pci_request_regions(pdev, DRV_NAME);
14976 if (err) 14977 if (err)
14977 goto disable_device; 14978 goto disable_device;
14978 pci_set_master(pdev); 14979 pci_set_master(pdev);
@@ -15007,7 +15008,7 @@ static void __devexit advansys_pci_remove(struct pci_dev *pdev)
15007} 15008}
15008 15009
15009static struct pci_driver advansys_pci_driver = { 15010static struct pci_driver advansys_pci_driver = {
15010 .name = "advansys", 15011 .name = DRV_NAME,
15011 .id_table = advansys_pci_tbl, 15012 .id_table = advansys_pci_tbl,
15012 .probe = advansys_pci_probe, 15013 .probe = advansys_pci_probe,
15013 .remove = __devexit_p(advansys_pci_remove), 15014 .remove = __devexit_p(advansys_pci_remove),