Re: Ok, lets kill the 'PCI hidden behind bridge' message (was: pci=assign-busses)

Greg KH
2007-07-30T20:14:51Z

On Mon, Jul 30, 2007 at 10:11:43PM +0200, Adrian Bunk wrote:
> On Mon, Jul 30, 2007 at 08:35:13PM +0200, Bernhard Kaindl wrote:
> >...
> > --- linux-2.6.22/drivers/pci/probe.c
> > +++ linux-2.6.22/drivers/pci/probe.c
> > @@ -643,23 +643,24 @@ int pci_scan_bridge(struct pci_bus *bus,
> >
> > sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus
> > #%02x"), child->number);
> >
> > +#ifdef DEBUG /* Has only triggered on CardBus, fixup is in yenta_socket */
> > while (bus->parent) {
> > if ((child->subordinate > bus->subordinate) ||
> > (child->number > bus->subordinate) ||
> > (child->number < bus->number) ||
> > (child->subordinate < bus->number)) {
> > - printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
> > - "hidden behind%s bridge #%02x (-#%02x)%s\n",
> > + pr_debug("PCI: Bus #%02x (-#%02x) is %s"
> > + "hidden behind%s bridge #%02x (-#%02x)\n",
> > child->number, child->subordinate,
> > + (bus->number > child->subordinate &&
> > + bus->subordinate < child->number) ?
> > + "wholly " : " partially",
> > bus->self->transparent ? " transparent" : " ",
> > - bus->number, bus->subordinate,
> > - pcibios_assign_all_busses() ? " " :
> > - " (try 'pci=assign-busses')");
> > - printk(KERN_WARNING "Please report the result to "
> > - "linux-kernel to fix this permanently\n");
> > + bus->number, bus->subordinate);
> > }
> > bus = bus->parent;
> > }
> > +#endif
> >
> > out:
> > pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
>
> "#ifdef DEBUG" plus pr_debug() is twoce the same.
>
> You don't need the #ifdef.

I took it out in the version I applied, and cleaned up the whitespace a
little bit too :)

thanks,

greg k-h