[SPARC64]: PCI device name changes.

arch/sparc64/kernel/pci.c

@@ -461,7 +461,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->name);
+		       resource, pdev->dev.name);
 	} else {
 		/* Update PCI config space. */
 		pbm->parent->base_address_update(pdev, resource);

arch/sparc64/kernel/pci_common.c

@@ -404,7 +404,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->name);
+				       res->start, (res - &pdev->resource[0]), pdev->dev.name);
 				continue;
 			}
 		}
@@ -426,7 +426,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->name);
+				       pdev->dev.name);
 			}
 		}
 	}
@@ -503,7 +503,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->name);
+				    i, pdev->dev.name);
 			prom_halt();
 		}
 
@@ -1005,7 +1005,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->name, status);
+			       pdev->dev.name, status);
 		}
 	}
 
@@ -1031,7 +1031,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->name, status);
+			       pdev->dev.name, status);
 		}
 	}
 
@@ -1058,7 +1058,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->name, status);
+			       pdev->dev.name, status);
 		}
 	}