Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9

Authored by Yinghai Lu
Committed by Bjorn Helgaas
1 parent 2d7abf3292
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

PCI: sgihp: use generic pci_hp_add_bridge() 

Use the new generic pci_hp_add_bridge() interface.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Showing 1 changed file with 5 additions and 9 deletions Side-by-side Diff

drivers/pci/hotplug/sgi_hotplug.c
Diff comments   View file @ 69ba29b
... ... @@ -397,15 +397,11 @@
397 397 else
398 398 sn_io_slot_fixup(dev);
399 399 if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
400   - unsigned char sec_bus;
401   - int max;
402   - pci_read_config_byte(dev, PCI_SECONDARY_BUS,
403   - &sec_bus);
404   - new_bus = pci_add_new_bus(dev->bus, dev,
405   - sec_bus);
406   - max = pci_scan_child_bus(new_bus);
407   - pci_bus_update_busn_res_end(new_bus, max);
408   - new_ppb = 1;
  400 + pci_hp_add_bridge(dev);
  401 + if (dev->subordinate) {
  402 + new_bus = dev->subordinate;
  403 + new_ppb = 1;
  404 + }
409 405 }
410 406 pci_dev_put(dev);
411 407 }