aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/it821x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/it821x.c')
-rw-r--r--drivers/ide/pci/it821x.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index a3d8959436c5..74173352741f 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -67,6 +67,8 @@
67#include <linux/ide.h> 67#include <linux/ide.h>
68#include <linux/init.h> 68#include <linux/init.h>
69 69
70#define DRV_NAME "it821x"
71
70struct it821x_dev 72struct it821x_dev
71{ 73{
72 unsigned int smart:1, /* Are we in smart raid mode */ 74 unsigned int smart:1, /* Are we in smart raid mode */
@@ -569,7 +571,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
569 idev->timing10 = 1; 571 idev->timing10 = 1;
570 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA; 572 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
571 if (idev->smart == 0) 573 if (idev->smart == 0)
572 printk(KERN_WARNING "it821x %s: revision 0x10, " 574 printk(KERN_WARNING DRV_NAME " %s: revision 0x10, "
573 "workarounds activated\n", pci_name(dev)); 575 "workarounds activated\n", pci_name(dev));
574 } 576 }
575 577
@@ -610,12 +612,12 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
610 612
611 /* Force the card into bypass mode if so requested */ 613 /* Force the card into bypass mode if so requested */
612 if (it8212_noraid) { 614 if (it8212_noraid) {
613 printk(KERN_INFO "it821x %s: forcing bypass mode\n", 615 printk(KERN_INFO DRV_NAME " %s: forcing bypass mode\n",
614 pci_name(dev)); 616 pci_name(dev));
615 it8212_disable_raid(dev); 617 it8212_disable_raid(dev);
616 } 618 }
617 pci_read_config_byte(dev, 0x50, &conf); 619 pci_read_config_byte(dev, 0x50, &conf);
618 printk(KERN_INFO "it821x %s: controller in %s mode\n", 620 printk(KERN_INFO DRV_NAME " %s: controller in %s mode\n",
619 pci_name(dev), mode[conf & 1]); 621 pci_name(dev), mode[conf & 1]);
620 return 0; 622 return 0;
621} 623}
@@ -629,7 +631,7 @@ static const struct ide_port_ops it821x_port_ops = {
629}; 631};
630 632
631static const struct ide_port_info it821x_chipset __devinitdata = { 633static const struct ide_port_info it821x_chipset __devinitdata = {
632 .name = "IT821X", 634 .name = DRV_NAME,
633 .init_chipset = init_chipset_it821x, 635 .init_chipset = init_chipset_it821x,
634 .init_hwif = init_hwif_it821x, 636 .init_hwif = init_hwif_it821x,
635 .port_ops = &it821x_port_ops, 637 .port_ops = &it821x_port_ops,
@@ -652,7 +654,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
652 654
653 itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL); 655 itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL);
654 if (itdevs == NULL) { 656 if (itdevs == NULL) {
655 printk(KERN_ERR "it821x %s: out of memory\n", pci_name(dev)); 657 printk(KERN_ERR DRV_NAME " %s: out of memory\n", pci_name(dev));
656 return -ENOMEM; 658 return -ENOMEM;
657 } 659 }
658 660