From a49261585e2c89f16b5a4bb80f623d2e9c2c1566 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 14 Jul 2006 16:49:55 -0700 Subject: [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() We shouldn't overwrite it, it's the device node full name already and that's what we want. Based upon a report from Marc Zyngier. Signed-off-by: David S. Miller --- arch/sparc64/kernel/pci_psycho.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/sparc64/kernel/pci_psycho.c') diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 197a7ffd57e..83f88ad4ffa 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c @@ -1099,9 +1099,6 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p, { char *name = pbm->name; - sprintf(name, "PSYCHO%d PBM%c", - p->index, - (pbm == &p->pbm_A ? 'A' : 'B')); pbm->io_space.name = pbm->mem_space.name = name; request_resource(&ioport_resource, &pbm->io_space); -- cgit v1.2.3-70-g09d2