aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/via82cxxx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/via82cxxx.c')
-rw-r--r--drivers/ide/pci/via82cxxx.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 23332556e616..170e058f1fbd 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -35,6 +35,8 @@
35#include <asm/processor.h> 35#include <asm/processor.h>
36#endif 36#endif
37 37
38#define DRV_NAME "via82cxxx"
39
38#define VIA_IDE_ENABLE 0x40 40#define VIA_IDE_ENABLE 0x40
39#define VIA_IDE_CONFIG 0x41 41#define VIA_IDE_CONFIG 0x41
40#define VIA_FIFO_CONFIG 0x43 42#define VIA_FIFO_CONFIG 0x43
@@ -373,7 +375,7 @@ static const struct ide_port_ops via_port_ops = {
373}; 375};
374 376
375static const struct ide_port_info via82cxxx_chipset __devinitdata = { 377static const struct ide_port_info via82cxxx_chipset __devinitdata = {
376 .name = "VP_IDE", 378 .name = DRV_NAME,
377 .init_chipset = init_chipset_via82cxxx, 379 .init_chipset = init_chipset_via82cxxx,
378 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } }, 380 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
379 .port_ops = &via_port_ops, 381 .port_ops = &via_port_ops,
@@ -401,7 +403,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
401 */ 403 */
402 via_config = via_config_find(&isa); 404 via_config = via_config_find(&isa);
403 if (!via_config->id) { 405 if (!via_config->id) {
404 printk(KERN_WARNING "VP_IDE %s: unknown chipset, skipping\n", 406 printk(KERN_WARNING DRV_NAME " %s: unknown chipset, skipping\n",
405 pci_name(dev)); 407 pci_name(dev));
406 return -ENODEV; 408 return -ENODEV;
407 } 409 }
@@ -409,7 +411,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
409 /* 411 /*
410 * Print the boot message. 412 * Print the boot message.
411 */ 413 */
412 printk(KERN_INFO "VP_IDE %s: VIA %s (rev %02x) IDE %sDMA%s\n", 414 printk(KERN_INFO DRV_NAME " %s: VIA %s (rev %02x) IDE %sDMA%s\n",
413 pci_name(dev), via_config->name, isa->revision, 415 pci_name(dev), via_config->name, isa->revision,
414 via_config->udma_mask ? "U" : "MW", 416 via_config->udma_mask ? "U" : "MW",
415 via_dma[via_config->udma_mask ? 417 via_dma[via_config->udma_mask ?
@@ -429,9 +431,9 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
429 } 431 }
430 432
431 if (via_clock < 20000 || via_clock > 50000) { 433 if (via_clock < 20000 || via_clock > 50000) {
432 printk(KERN_WARNING "VP_IDE: User given PCI clock speed " 434 printk(KERN_WARNING DRV_NAME ": User given PCI clock speed "
433 "impossible (%d), using 33 MHz instead.\n", via_clock); 435 "impossible (%d), using 33 MHz instead.\n", via_clock);
434 printk(KERN_WARNING "VP_IDE: Use ide0=ata66 if you want " 436 printk(KERN_WARNING DRV_NAME ": Use ide0=ata66 if you want "
435 "to assume 80-wire cable.\n"); 437 "to assume 80-wire cable.\n");
436 via_clock = 33333; 438 via_clock = 33333;
437 } 439 }
@@ -453,7 +455,8 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
453 455
454 vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); 456 vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
455 if (!vdev) { 457 if (!vdev) {
456 printk(KERN_ERR "VP_IDE %s: out of memory :(\n", pci_name(dev)); 458 printk(KERN_ERR DRV_NAME " %s: out of memory :(\n",
459 pci_name(dev));
457 return -ENOMEM; 460 return -ENOMEM;
458 } 461 }
459 462