On Wed, Jul 02, 2008 at 09:04:22AM -0700, Greg KH wrote: > On Wed, Jul 02, 2008 at 08:58:20AM -0700, Jesse Barnes wrote: > > On Wednesday, July 02, 2008 8:51 am Greg Kroah-Hartman wrote: > > > On Wed, Jul 02, 2008 at 08:35:24AM -0700, Greg Kroah-Hartman wrote: > > > > From: Greg Kroah-Hartman <gregkh@xxxxxxx> > > > > > > > > Also fixes up the sparc PCI code that was assuming this is not a > > > > constant. > > > > > > > > This is done in anticipation of removing the bus_id field from struct > > > > driver. > > > > > > > > Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx> > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> > > > > > > > > --- > > > > arch/sparc64/kernel/pci.c | 2 +- > > > > include/linux/pci.h | 4 ++-- > > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > > > --- a/arch/sparc64/kernel/pci.c > > > > +++ b/arch/sparc64/kernel/pci.c > > > > @@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct > > > > dev->class = class >> 8; > > > > dev->revision = class & 0xff; > > > > > > > > - sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), > > > > + sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus), > > > > dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); > > > > > > > > if (ofpci_verbose) > > > > --- a/include/linux/pci.h > > > > +++ b/include/linux/pci.h > > > > @@ -977,9 +977,9 @@ static inline void pci_set_drvdata(struc > > > > /* If you want to know what to call your pci_dev, ask this function. > > > > * Again, it's a wrapper around the generic device. > > > > */ > > > > -static inline char *pci_name(struct pci_dev *pdev) > > > > +static inline const char *pci_name(struct pci_dev *pdev) > > > > > > Andrew just pointed out to me that this causes a bunch of compiler > > > warnings to be generated. I'll go audit the tree to fix them as well > > > and send you a follow-on patch if that's ok. > > > > Yeah, works for me. I've got at least one other patch along these lines > > already. Assuming Dave doesn't want to handle these SPARC PCI patches > > anyway... > > Well, it's only used in 837 different places, so it might take me a few > hours to ensure I catch all the usages :( Ok, here are 4 patches that fix the few places that this pci change caused problems. Jesse, do you want to add these to your tree? I can take the single USB one if you want, or you can take all 4, it's fine with me. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
