ASoC: simple-card: Use snd_soc_of_parse_aux_devs()

[linux.git] / drivers / pci / controller / pci-host-common.c

diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
index ad395d7feddc52ee311e387ab21a609b60b45ece..6ce34a1deecb2cd306f93fbd3b7ed113ef6f5cd7 100644 (file)
--- a/drivers/pci/controller/pci-host-common.c
+++ b/drivers/pci/controller/pci-host-common.c
@@ -25,21 +25,20 @@ static struct pci_config_window *gen_pci_init(struct device *dev,
 {
        int err;
        struct resource cfgres;
-       struct resource *bus_range = NULL;
+       struct resource_entry *bus;
        struct pci_config_window *cfg;
 
-       /* Parse our PCI ranges and request their resources */
-       err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL, &bus_range);
-       if (err)
-               return ERR_PTR(err);
-
        err = of_address_to_resource(dev->of_node, 0, &cfgres);
        if (err) {
                dev_err(dev, "missing \"reg\" property\n");
                return ERR_PTR(err);
        }
 
-       cfg = pci_ecam_create(dev, &cfgres, bus_range, ops);
+       bus = resource_list_first_type(&bridge->windows, IORESOURCE_BUS);
+       if (!bus)
+               return ERR_PTR(-ENODEV);
+
+       cfg = pci_ecam_create(dev, &cfgres, bus->res, ops);
        if (IS_ERR(cfg))
                return cfg;
 
@@ -77,10 +76,7 @@ int pci_host_common_probe(struct platform_device *pdev)
                pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
        bridge->sysdata = cfg;
-       bridge->busnr = cfg->busr.start;
        bridge->ops = (struct pci_ops *)&ops->pci_ops;
-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;
 
        platform_set_drvdata(pdev, bridge);