diff options
Diffstat (limited to 'drivers/ide/pci/hpt366.c')
-rw-r--r-- | drivers/ide/pci/hpt366.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 398808905f94..b8004c331edb 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -1044,8 +1044,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
1044 | if ((temp & 0xFFFFF000) != 0xABCDE000) { | 1044 | if ((temp & 0xFFFFF000) != 0xABCDE000) { |
1045 | int i; | 1045 | int i; |
1046 | 1046 | ||
1047 | printk(KERN_WARNING "%s: no clock data saved by BIOS\n", | 1047 | printk(KERN_WARNING "%s %s: no clock data saved by " |
1048 | name); | 1048 | "BIOS\n", name, pci_name(dev)); |
1049 | 1049 | ||
1050 | /* Calculate the average value of f_CNT. */ | 1050 | /* Calculate the average value of f_CNT. */ |
1051 | for (temp = i = 0; i < 128; i++) { | 1051 | for (temp = i = 0; i < 128; i++) { |
@@ -1070,8 +1070,9 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
1070 | else | 1070 | else |
1071 | pci_clk = 66; | 1071 | pci_clk = 66; |
1072 | 1072 | ||
1073 | printk(KERN_INFO "%s: DPLL base: %d MHz, f_CNT: %d, " | 1073 | printk(KERN_INFO "%s %s: DPLL base: %d MHz, f_CNT: %d, " |
1074 | "assuming %d MHz PCI\n", name, dpll_clk, f_cnt, pci_clk); | 1074 | "assuming %d MHz PCI\n", name, pci_name(dev), |
1075 | dpll_clk, f_cnt, pci_clk); | ||
1075 | } else { | 1076 | } else { |
1076 | u32 itr1 = 0; | 1077 | u32 itr1 = 0; |
1077 | 1078 | ||
@@ -1137,7 +1138,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
1137 | } | 1138 | } |
1138 | 1139 | ||
1139 | if (info->timings->clock_table[clock] == NULL) { | 1140 | if (info->timings->clock_table[clock] == NULL) { |
1140 | printk(KERN_ERR "%s: unknown bus timing!\n", name); | 1141 | printk(KERN_ERR "%s %s: unknown bus timing!\n", |
1142 | name, pci_name(dev)); | ||
1141 | return -EIO; | 1143 | return -EIO; |
1142 | } | 1144 | } |
1143 | 1145 | ||
@@ -1163,16 +1165,19 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha | |||
1163 | f_low += adjust >> 1; | 1165 | f_low += adjust >> 1; |
1164 | } | 1166 | } |
1165 | if (adjust == 8) { | 1167 | if (adjust == 8) { |
1166 | printk(KERN_ERR "%s: DPLL did not stabilize!\n", name); | 1168 | printk(KERN_ERR "%s %s: DPLL did not stabilize!\n", |
1169 | name, pci_name(dev)); | ||
1167 | return -EIO; | 1170 | return -EIO; |
1168 | } | 1171 | } |
1169 | 1172 | ||
1170 | printk("%s: using %d MHz DPLL clock\n", name, dpll_clk); | 1173 | printk(KERN_INFO "%s %s: using %d MHz DPLL clock\n", |
1174 | name, pci_name(dev), dpll_clk); | ||
1171 | } else { | 1175 | } else { |
1172 | /* Mark the fact that we're not using the DPLL. */ | 1176 | /* Mark the fact that we're not using the DPLL. */ |
1173 | dpll_clk = 0; | 1177 | dpll_clk = 0; |
1174 | 1178 | ||
1175 | printk("%s: using %d MHz PCI clock\n", name, pci_clk); | 1179 | printk(KERN_INFO "%s %s: using %d MHz PCI clock\n", |
1180 | name, pci_name(dev), pci_clk); | ||
1176 | } | 1181 | } |
1177 | 1182 | ||
1178 | /* Store the clock frequencies. */ | 1183 | /* Store the clock frequencies. */ |
@@ -1357,7 +1362,8 @@ static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) | |||
1357 | if (dev2->irq != dev->irq) { | 1362 | if (dev2->irq != dev->irq) { |
1358 | /* FIXME: we need a core pci_set_interrupt() */ | 1363 | /* FIXME: we need a core pci_set_interrupt() */ |
1359 | dev2->irq = dev->irq; | 1364 | dev2->irq = dev->irq; |
1360 | printk(KERN_INFO "HPT374: PCI config space interrupt fixed\n"); | 1365 | printk(KERN_INFO "HPT374 %s: PCI config space interrupt " |
1366 | "fixed\n", pci_name(dev2)); | ||
1361 | } | 1367 | } |
1362 | } | 1368 | } |
1363 | 1369 | ||
@@ -1392,8 +1398,8 @@ static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2) | |||
1392 | pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2); | 1398 | pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2); |
1393 | 1399 | ||
1394 | if (pin1 != pin2 && dev->irq == dev2->irq) { | 1400 | if (pin1 != pin2 && dev->irq == dev2->irq) { |
1395 | printk(KERN_INFO "HPT36x: onboard version of chipset, " | 1401 | printk(KERN_INFO "HPT36x %s: onboard version of chipset, " |
1396 | "pin1=%d pin2=%d\n", pin1, pin2); | 1402 | "pin1=%d pin2=%d\n", pci_name(dev), pin1, pin2); |
1397 | return 1; | 1403 | return 1; |
1398 | } | 1404 | } |
1399 | 1405 | ||
@@ -1591,7 +1597,8 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic | |||
1591 | 1597 | ||
1592 | dyn_info = kzalloc(sizeof(*dyn_info) * (dev2 ? 2 : 1), GFP_KERNEL); | 1598 | dyn_info = kzalloc(sizeof(*dyn_info) * (dev2 ? 2 : 1), GFP_KERNEL); |
1593 | if (dyn_info == NULL) { | 1599 | if (dyn_info == NULL) { |
1594 | printk(KERN_ERR "%s: out of memory!\n", d.name); | 1600 | printk(KERN_ERR "%s %s: out of memory!\n", |
1601 | d.name, pci_name(dev)); | ||
1595 | pci_dev_put(dev2); | 1602 | pci_dev_put(dev2); |
1596 | return -ENOMEM; | 1603 | return -ENOMEM; |
1597 | } | 1604 | } |