diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/probe.c | 12 | ||||
-rw-r--r-- | drivers/pci/setup-bus.c | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ef17cf99830e..fd6066dfde5c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -288,10 +288,6 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) | |||
288 | if (!res->end) | 288 | if (!res->end) |
289 | res->end = limit + 0xfff; | 289 | res->end = limit + 0xfff; |
290 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); | 290 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); |
291 | } else { | ||
292 | dev_printk(KERN_DEBUG, &dev->dev, | ||
293 | " bridge window [io %#06lx-%#06lx] (disabled)\n", | ||
294 | base, limit); | ||
295 | } | 291 | } |
296 | } | 292 | } |
297 | 293 | ||
@@ -312,10 +308,6 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) | |||
312 | res->start = base; | 308 | res->start = base; |
313 | res->end = limit + 0xfffff; | 309 | res->end = limit + 0xfffff; |
314 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); | 310 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); |
315 | } else { | ||
316 | dev_printk(KERN_DEBUG, &dev->dev, | ||
317 | " bridge window [mem %#010lx-%#010lx] (disabled)\n", | ||
318 | base, limit + 0xfffff); | ||
319 | } | 311 | } |
320 | } | 312 | } |
321 | 313 | ||
@@ -363,10 +355,6 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) | |||
363 | res->start = base; | 355 | res->start = base; |
364 | res->end = limit + 0xfffff; | 356 | res->end = limit + 0xfffff; |
365 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); | 357 | dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res); |
366 | } else { | ||
367 | dev_printk(KERN_DEBUG, &dev->dev, | ||
368 | " bridge window [mem %#010lx-%#010lx pref] (disabled)\n", | ||
369 | base, limit + 0xfffff); | ||
370 | } | 358 | } |
371 | } | 359 | } |
372 | 360 | ||
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 9995842e45b5..8a1d3c7863a8 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -336,7 +336,6 @@ static void pci_setup_bridge_io(struct pci_bus *bus) | |||
336 | /* Clear upper 16 bits of I/O base/limit. */ | 336 | /* Clear upper 16 bits of I/O base/limit. */ |
337 | io_upper16 = 0; | 337 | io_upper16 = 0; |
338 | l = 0x00f0; | 338 | l = 0x00f0; |
339 | dev_info(&bridge->dev, " bridge window [io disabled]\n"); | ||
340 | } | 339 | } |
341 | /* Temporarily disable the I/O range before updating PCI_IO_BASE. */ | 340 | /* Temporarily disable the I/O range before updating PCI_IO_BASE. */ |
342 | pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff); | 341 | pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff); |
@@ -362,7 +361,6 @@ static void pci_setup_bridge_mmio(struct pci_bus *bus) | |||
362 | dev_info(&bridge->dev, " bridge window %pR\n", res); | 361 | dev_info(&bridge->dev, " bridge window %pR\n", res); |
363 | } else { | 362 | } else { |
364 | l = 0x0000fff0; | 363 | l = 0x0000fff0; |
365 | dev_info(&bridge->dev, " bridge window [mem disabled]\n"); | ||
366 | } | 364 | } |
367 | pci_write_config_dword(bridge, PCI_MEMORY_BASE, l); | 365 | pci_write_config_dword(bridge, PCI_MEMORY_BASE, l); |
368 | } | 366 | } |
@@ -393,7 +391,6 @@ static void pci_setup_bridge_mmio_pref(struct pci_bus *bus) | |||
393 | dev_info(&bridge->dev, " bridge window %pR\n", res); | 391 | dev_info(&bridge->dev, " bridge window %pR\n", res); |
394 | } else { | 392 | } else { |
395 | l = 0x0000fff0; | 393 | l = 0x0000fff0; |
396 | dev_info(&bridge->dev, " bridge window [mem pref disabled]\n"); | ||
397 | } | 394 | } |
398 | pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l); | 395 | pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l); |
399 | 396 | ||