[SPARC64]: Use pci_name() in sparc64 PCI layer.

arch/sparc64/kernel/pci.c

@@ -438,7 +438,7 @@ int pci_assign_resource(struct pci_dev *pdev, int resource)
 
 	if (err < 0) {
 		printk("PCI: Failed to allocate resource %d for %s\n",
-		       resource, pdev->dev.name);
+		       resource, pci_name(pdev));
 	} else {
 		/* Update PCI config space. */
 		pbm->parent->base_address_update(pdev, resource);
@@ -465,7 +465,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 		if (!r_align) {
 			printk(KERN_WARNING "PCI: Ignore bogus resource %d "
 					    "[%lx:%lx] of %s\n",
-					    i, r->start, r->end, dev->dev.name);
+					    i, r->start, r->end, pci_name(dev));
 			continue;
 		}
 		r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;

arch/sparc64/kernel/pci_common.c

@@ -391,7 +391,7 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
 			if ((res->start >> 32) != 0UL) {
 				printk(KERN_ERR "PCI: OBP assigns out of range MEM address "
 				       "%016lx for region %ld on device %s\n",
-				       res->start, (res - &pdev->resource[0]), pdev->dev.name);
+				       res->start, (res - &pdev->resource[0]), pci_name(pdev));
 				continue;
 			}
 		}
@@ -413,7 +413,7 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
 				       "[%016lx:%016lx] of device %s\n",
 				       (res - &pdev->resource[0]),
 				       res->start, res->end,
-				       pdev->dev.name);
+				       pci_name(pdev));
 			}
 		}
 	}
@@ -490,7 +490,7 @@ static void __init pdev_assign_unassigned(struct pci_pbm_info *pbm,
 		if (allocate_resource(root, res, size + 1, min, max, align, NULL, NULL) < 0) {
 			/* uh oh */
 			prom_printf("PCI: Failed to allocate resource %d for %s\n",
-				    i, pdev->dev.name);
+				    i, pci_name(pdev));
 			prom_halt();
 		}
 
@@ -992,7 +992,7 @@ void pci_scan_for_target_abort(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] saw Target Abort [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->dev.name, status);
+			       pci_name(pdev), status);
 		}
 	}
 
@@ -1018,7 +1018,7 @@ void pci_scan_for_master_abort(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] received Master Abort [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->dev.name, status);
+			       pci_name(pdev), status);
 		}
 	}
 
@@ -1045,7 +1045,7 @@ void pci_scan_for_parity_error(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] saw Parity Error [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->dev.name, status);
+			       pci_name(pdev), status);
 		}
 	}