diff options
author | Joe Perches <joe@perches.com> | 2011-01-31 11:39:24 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-03-14 02:56:31 -0400 |
commit | 8d7b1c70b3c1aac4b63109f5c73f732f1d63fad6 (patch) | |
tree | 0b09875f032489c28efe29828d7faae2d61afaa8 /drivers/ata/pata_hpt3x2n.c | |
parent | a17139b6f63709b2d409c027f8ab401f5aa136d3 (diff) |
ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>
Commit 40d69ba029c8d5de51aaeb5358999266c482d00a
("pata_hpt{37x|3x2n}: use pr_*(DRV_NAME ...) instead of printk(KERN_* ...)")
used pr_<level>.
Add #define pr_fmt and remove DRV_NAME.
Increment driver version numbers.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata/pata_hpt3x2n.c')
-rw-r--r-- | drivers/ata/pata_hpt3x2n.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c index eca68caf5f46..765f136d8cd3 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c | |||
@@ -15,6 +15,8 @@ | |||
15 | * Work out best PLL policy | 15 | * Work out best PLL policy |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
19 | |||
18 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
19 | #include <linux/module.h> | 21 | #include <linux/module.h> |
20 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
@@ -25,7 +27,7 @@ | |||
25 | #include <linux/libata.h> | 27 | #include <linux/libata.h> |
26 | 28 | ||
27 | #define DRV_NAME "pata_hpt3x2n" | 29 | #define DRV_NAME "pata_hpt3x2n" |
28 | #define DRV_VERSION "0.3.14" | 30 | #define DRV_VERSION "0.3.15" |
29 | 31 | ||
30 | enum { | 32 | enum { |
31 | HPT_PCI_FAST = (1 << 31), | 33 | HPT_PCI_FAST = (1 << 31), |
@@ -418,7 +420,7 @@ static int hpt3x2n_pci_clock(struct pci_dev *pdev) | |||
418 | u16 sr; | 420 | u16 sr; |
419 | u32 total = 0; | 421 | u32 total = 0; |
420 | 422 | ||
421 | pr_warning(DRV_NAME ": BIOS clock data not set.\n"); | 423 | pr_warn("BIOS clock data not set\n"); |
422 | 424 | ||
423 | /* This is the process the HPT371 BIOS is reported to use */ | 425 | /* This is the process the HPT371 BIOS is reported to use */ |
424 | for (i = 0; i < 128; i++) { | 426 | for (i = 0; i < 128; i++) { |
@@ -528,8 +530,7 @@ hpt372n: | |||
528 | ppi[0] = &info_hpt372n; | 530 | ppi[0] = &info_hpt372n; |
529 | break; | 531 | break; |
530 | default: | 532 | default: |
531 | pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n", | 533 | pr_err("PCI table is bogus, please report (%d)\n", dev->device); |
532 | dev->device); | ||
533 | return -ENODEV; | 534 | return -ENODEV; |
534 | } | 535 | } |
535 | 536 | ||
@@ -578,11 +579,11 @@ hpt372n: | |||
578 | pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low); | 579 | pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low); |
579 | } | 580 | } |
580 | if (adjust == 8) { | 581 | if (adjust == 8) { |
581 | pr_err(DRV_NAME ": DPLL did not stabilize!\n"); | 582 | pr_err("DPLL did not stabilize!\n"); |
582 | return -ENODEV; | 583 | return -ENODEV; |
583 | } | 584 | } |
584 | 585 | ||
585 | pr_info(DRV_NAME ": bus clock %dMHz, using 66MHz DPLL.\n", pci_mhz); | 586 | pr_info("bus clock %dMHz, using 66MHz DPLL\n", pci_mhz); |
586 | 587 | ||
587 | /* | 588 | /* |
588 | * Set our private data up. We only need a few flags | 589 | * Set our private data up. We only need a few flags |