lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>

Browse Source 
Commit 40d69ba029
("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>
This commit is contained in:
Joe Perches
2011-01-31 08:39:24 -08:00
committed by Jeff Garzik
parent a17139b6f6
commit 8d7b1c70b3
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ata/pata_hpt366.c
View File

@@ -14,6 +14,7 @@
* Look into engine reset on timeout errors. Should not be required. * Look into engine reset on timeout errors. Should not be required.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
@@ -25,7 +26,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_hpt366" #define DRV_NAME "pata_hpt366"
#define DRV_VERSION "0.6.10" #define DRV_VERSION "0.6.11"
struct hpt_clock { struct hpt_clock {
u8 xfer_mode; u8 xfer_mode;
@@ -160,8 +161,8 @@ static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr,
while (list[i] != NULL) { while (list[i] != NULL) {
if (!strcmp(list[i], model_num)) { if (!strcmp(list[i], model_num)) {
pr_warning(DRV_NAME ": %s is not supported for %s.\n", pr_warn("%s is not supported for %s\n",
modestr, list[i]); modestr, list[i]);
return 1; return 1;
} }
i++; i++;

23
drivers/ata/pata_hpt37x.c
View File

@@ -14,6 +14,8 @@
* Look into engine reset on timeout errors. Should not be required. * Look into engine reset on timeout errors. Should not be required.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
@@ -24,7 +26,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_hpt37x" #define DRV_NAME "pata_hpt37x"
#define DRV_VERSION "0.6.22" #define DRV_VERSION "0.6.23"
struct hpt_clock { struct hpt_clock {
u8 xfer_speed; u8 xfer_speed;
@@ -229,8 +231,8 @@ static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr,
while (list[i] != NULL) { while (list[i] != NULL) {
if (!strcmp(list[i], model_num)) { if (!strcmp(list[i], model_num)) {
pr_warning(DRV_NAME ": %s is not supported for %s.\n", pr_warn("%s is not supported for %s\n",
modestr, list[i]); modestr, list[i]);
return 1; return 1;
} }
i++; i++;
@@ -863,8 +865,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
chip_table = &hpt372; chip_table = &hpt372;
break; break;
default: default:
pr_err(DRV_NAME ": Unknown HPT366 subtype, " pr_err("Unknown HPT366 subtype, please report (%d)\n",
"please report (%d).\n", rev); rev);
return -ENODEV; return -ENODEV;
} }
break; break;
@@ -904,8 +906,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
*ppi = &info_hpt374_fn1; *ppi = &info_hpt374_fn1;
break; break;
default: default:
pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n", pr_err("PCI table is bogus, please report (%d)\n", dev->device);
dev->device);
return -ENODEV; return -ENODEV;
} }
/* Ok so this is a chip we support */ /* Ok so this is a chip we support */
@@ -953,7 +954,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
u8 sr; u8 sr;
u32 total = 0; u32 total = 0;
pr_warning(DRV_NAME ": BIOS has not set timing clocks.\n"); pr_warn("BIOS has not set timing clocks\n");
/* This is the process the HPT371 BIOS is reported to use */ /* This is the process the HPT371 BIOS is reported to use */
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
@@ -1009,7 +1010,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
(f_high << 16) | f_low | 0x100); (f_high << 16) | f_low | 0x100);
} }
if (adjust == 8) { if (adjust == 8) {
pr_err(DRV_NAME ": DPLL did not stabilize!\n"); pr_err("DPLL did not stabilize!\n");
return -ENODEV; return -ENODEV;
} }
if (dpll == 3) if (dpll == 3)
@@ -1017,7 +1018,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
else else
private_data = (void *)hpt37x_timings_50; private_data = (void *)hpt37x_timings_50;
pr_info(DRV_NAME ": bus clock %dMHz, using %dMHz DPLL.\n", pr_info("bus clock %dMHz, using %dMHz DPLL\n",
MHz[clock_slot], MHz[dpll]); MHz[clock_slot], MHz[dpll]);
} else { } else {
private_data = (void *)chip_table->clocks[clock_slot]; private_data = (void *)chip_table->clocks[clock_slot];
@@ -1032,7 +1033,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
if (clock_slot < 2 && ppi[0] == &info_hpt370a) if (clock_slot < 2 && ppi[0] == &info_hpt370a)
ppi[0] = &info_hpt370a_33; ppi[0] = &info_hpt370a_33;
pr_info(DRV_NAME ": %s using %dMHz bus clock.\n", pr_info("%s using %dMHz bus clock\n",
chip_table->name, MHz[clock_slot]); chip_table->name, MHz[clock_slot]);
} }

13
drivers/ata/pata_hpt3x2n.c
View File

@@ -15,6 +15,8 @@
* Work out best PLL policy * Work out best PLL policy
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
@@ -25,7 +27,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_hpt3x2n" #define DRV_NAME "pata_hpt3x2n"
#define DRV_VERSION "0.3.14" #define DRV_VERSION "0.3.15"
enum { enum {
HPT_PCI_FAST = (1 << 31), HPT_PCI_FAST = (1 << 31),
@@ -418,7 +420,7 @@ static int hpt3x2n_pci_clock(struct pci_dev *pdev)
u16 sr; u16 sr;
u32 total = 0; u32 total = 0;
pr_warning(DRV_NAME ": BIOS clock data not set.\n"); pr_warn("BIOS clock data not set\n");
/* This is the process the HPT371 BIOS is reported to use */ /* This is the process the HPT371 BIOS is reported to use */
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
@@ -528,8 +530,7 @@ hpt372n:
ppi[0] = &info_hpt372n; ppi[0] = &info_hpt372n;
break; break;
default: default:
pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n", pr_err("PCI table is bogus, please report (%d)\n", dev->device);
dev->device);
return -ENODEV; return -ENODEV;
} }
@@ -578,11 +579,11 @@ hpt372n:
pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low); pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low);
} }
if (adjust == 8) { if (adjust == 8) {
pr_err(DRV_NAME ": DPLL did not stabilize!\n"); pr_err("DPLL did not stabilize!\n");
return -ENODEV; return -ENODEV;
} }
pr_info(DRV_NAME ": bus clock %dMHz, using 66MHz DPLL.\n", pci_mhz); pr_info("bus clock %dMHz, using 66MHz DPLL\n", pci_mhz);
/* /*
* Set our private data up. We only need a few flags * Set our private data up. We only need a few flags