aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_hpt37x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_hpt37x.c')
-rw-r--r--drivers/ata/pata_hpt37x.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index a1f830eaa7c9..6003a34d614e 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -24,7 +24,7 @@
24#include <linux/libata.h> 24#include <linux/libata.h>
25 25
26#define DRV_NAME "pata_hpt37x" 26#define DRV_NAME "pata_hpt37x"
27#define DRV_VERSION "0.6.19" 27#define DRV_VERSION "0.6.20"
28 28
29struct hpt_clock { 29struct hpt_clock {
30 u8 xfer_speed; 30 u8 xfer_speed;
@@ -863,7 +863,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
863 chip_table = &hpt372; 863 chip_table = &hpt372;
864 break; 864 break;
865 default: 865 default:
866 printk(KERN_ERR "pata_hpt37x: Unknown HPT366 subtype, " 866 pr_err(DRV_NAME ": Unknown HPT366 subtype, "
867 "please report (%d).\n", rev); 867 "please report (%d).\n", rev);
868 return -ENODEV; 868 return -ENODEV;
869 } 869 }
@@ -906,8 +906,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
906 *ppi = &info_hpt374_fn1; 906 *ppi = &info_hpt374_fn1;
907 break; 907 break;
908 default: 908 default:
909 printk(KERN_ERR 909 pr_err(DRV_NAME
910 "pata_hpt37x: PCI table is bogus, please report (%d).\n", 910 ": PCI table is bogus, please report (%d).\n",
911 dev->device); 911 dev->device);
912 return -ENODEV; 912 return -ENODEV;
913 } 913 }
@@ -957,8 +957,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
957 u8 sr; 957 u8 sr;
958 u32 total = 0; 958 u32 total = 0;
959 959
960 printk(KERN_WARNING 960 pr_warning(DRV_NAME ": BIOS has not set timing clocks.\n");
961 "pata_hpt37x: BIOS has not set timing clocks.\n");
962 961
963 /* This is the process the HPT371 BIOS is reported to use */ 962 /* This is the process the HPT371 BIOS is reported to use */
964 for (i = 0; i < 128; i++) { 963 for (i = 0; i < 128; i++) {
@@ -1014,7 +1013,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
1014 (f_high << 16) | f_low | 0x100); 1013 (f_high << 16) | f_low | 0x100);
1015 } 1014 }
1016 if (adjust == 8) { 1015 if (adjust == 8) {
1017 printk(KERN_ERR "pata_hpt37x: DPLL did not stabilize!\n"); 1016 pr_err(DRV_NAME ": DPLL did not stabilize!\n");
1018 return -ENODEV; 1017 return -ENODEV;
1019 } 1018 }
1020 if (dpll == 3) 1019 if (dpll == 3)
@@ -1022,8 +1021,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
1022 else 1021 else
1023 private_data = (void *)hpt37x_timings_50; 1022 private_data = (void *)hpt37x_timings_50;
1024 1023
1025 printk(KERN_INFO "pata_hpt37x: bus clock %dMHz, using %dMHz DPLL.\n", 1024 pr_info(DRV_NAME ": bus clock %dMHz, using %dMHz DPLL.\n",
1026 MHz[clock_slot], MHz[dpll]); 1025 MHz[clock_slot], MHz[dpll]);
1027 } else { 1026 } else {
1028 private_data = (void *)chip_table->clocks[clock_slot]; 1027 private_data = (void *)chip_table->clocks[clock_slot];
1029 /* 1028 /*
@@ -1036,8 +1035,9 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
1036 ppi[0] = &info_hpt370_33; 1035 ppi[0] = &info_hpt370_33;
1037 if (clock_slot < 2 && ppi[0] == &info_hpt370a) 1036 if (clock_slot < 2 && ppi[0] == &info_hpt370a)
1038 ppi[0] = &info_hpt370a_33; 1037 ppi[0] = &info_hpt370a_33;
1039 printk(KERN_INFO "pata_hpt37x: %s using %dMHz bus clock.\n", 1038
1040 chip_table->name, MHz[clock_slot]); 1039 pr_info(DRV_NAME ": %s using %dMHz bus clock.\n",
1040 chip_table->name, MHz[clock_slot]);
1041 } 1041 }
1042 1042
1043 /* Now kick off ATA set up */ 1043 /* Now kick off ATA set up */