Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b87c9df authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: remove printks about disabled bridge windows 



I don't think there's enough value in the fact of a bridge window
being disabled to justify cluttering the dmesg log with it.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 28c6821a

drivers/pci/probe.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -288,10 +288,6 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) 
		if (!res->end)

		if (!res->end)

			res->end = limit + 0xfff;

			res->end = limit + 0xfff;

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	} else {

		dev_printk(KERN_DEBUG, &dev->dev,

			 "  bridge window [io  %#06lx-%#06lx] (disabled)\n",

				 base, limit);

	}

	}

}

}
@@ -312,10 +308,6 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) 
		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	} else {

		dev_printk(KERN_DEBUG, &dev->dev,

			"  bridge window [mem %#010lx-%#010lx] (disabled)\n",

					 base, limit + 0xfffff);

	}

	}

}

}
@@ -363,10 +355,6 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) 
		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	} else {

		dev_printk(KERN_DEBUG, &dev->dev,

		     "  bridge window [mem %#010lx-%#010lx pref] (disabled)\n",

					 base, limit + 0xfffff);

	}

	}

}

}

drivers/pci/setup-bus.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -336,7 +336,6 @@ static void pci_setup_bridge_io(struct pci_bus *bus) 
		/* Clear upper 16 bits of I/O base/limit. */

		/* Clear upper 16 bits of I/O base/limit. */

		io_upper16 = 0;

		io_upper16 = 0;

		l = 0x00f0;

		l = 0x00f0;

		dev_info(&bridge->dev, "  bridge window [io  disabled]\n");

	}

	}

	/* Temporarily disable the I/O range before updating PCI_IO_BASE. */

	/* Temporarily disable the I/O range before updating PCI_IO_BASE. */

	pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff);

	pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff);
@@ -362,7 +361,6 @@ static void pci_setup_bridge_mmio(struct pci_bus *bus) 
		dev_info(&bridge->dev, "  bridge window %pR\n", res);

		dev_info(&bridge->dev, "  bridge window %pR\n", res);

	} else {

	} else {

		l = 0x0000fff0;

		l = 0x0000fff0;

		dev_info(&bridge->dev, "  bridge window [mem disabled]\n");

	}

	}

	pci_write_config_dword(bridge, PCI_MEMORY_BASE, l);

	pci_write_config_dword(bridge, PCI_MEMORY_BASE, l);

}

}
@@ -393,7 +391,6 @@ static void pci_setup_bridge_mmio_pref(struct pci_bus *bus) 
		dev_info(&bridge->dev, "  bridge window %pR\n", res);

		dev_info(&bridge->dev, "  bridge window %pR\n", res);

	} else {

	} else {

		l = 0x0000fff0;

		l = 0x0000fff0;

		dev_info(&bridge->dev, "  bridge window [mem pref disabled]\n");

	}

	}

	pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l);

	pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l);