]> err.no Git - linux-2.6/commitdiff
[SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources()
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 14 Jul 2006 23:49:55 +0000 (16:49 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sat, 15 Jul 2006 00:00:28 +0000 (17:00 -0700)
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 <davem@davemloft.net>
arch/sparc64/kernel/pci_psycho.c

index 197a7ffd57ee32dc8635644be48e5c71fe02317b..83f88ad4ffa5c77a873fd1f32ed92d9867bd6493 100644 (file)
@@ -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);