linux-next: sparc64 build failure
From: Stephen Rothwell <hidden>
Date: 2008-05-29 07:53:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Attachments
- (unnamed) [application/pgp-signature] 189 bytes
From: Stephen Rothwell <hidden>
Date: 2008-05-29 07:53:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Hi Dave, Greg,
Today's build of linux-next (sparc64 defconfig) failed like this:
arch/sparc64/kernel/pci.c: In function `of_create_pci_dev':
arch/sparc64/kernel/pci.c:412: warning: passing arg 1 of `sprintf' discards qualifiers from pointer target type
make[2]: *** [arch/sparc64/kernel/pci.o] Error 1
This was caused by commit bd24b944eb93549b1ca5becbf27c7373504f7eed
("driver-core: prepare for removal of 20 char limit from struct device")
from the driver-core tree which made pci_name() return a "const char *".
I have applied the following patch.
Greg, it would really help if a version of dev_set_name() was created
early ... like in Linus' tree now?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From eee5cd99ea3b4e93f41e7f6486d799d198c87750 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <redacted> Date: Thu, 29 May 2008 17:51:05 +1000 Subject: [PATCH] sparc: fallout from pci_name() constifying Signed-off-by: Stephen Rothwell <redacted> --- arch/sparc64/kernel/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 112b09f..5509619 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, dev->class = class >> 8; dev->revision = class & 0xff; - sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), + dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus), dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); if (ofpci_verbose)
--
1.5.5.2