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 953de57f6c570704543118394a0a26008d757d32..6ce34a1deecb2cd306f93fbd3b7ed113ef6f5cd7 100644 (file)
--- a/drivers/pci/controller/pci-host-common.c
+++ b/drivers/pci/controller/pci-host-common.c
@@ -21,39 +21,32 @@ static void gen_pci_unmap_cfg(void *ptr)
 }
 
 static struct pci_config_window *gen_pci_init(struct device *dev,
 }
 
 static struct pci_config_window *gen_pci_init(struct device *dev,

-               struct list_head *resources, const struct pci_ecam_ops *ops)
+               struct pci_host_bridge *bridge, const struct pci_ecam_ops *ops)

 {
        int err;
        struct resource cfgres;
 {
        int err;
        struct resource cfgres;

-       struct resource *bus_range = NULL;
+       struct resource_entry *bus;

        struct pci_config_window *cfg;
 
        struct pci_config_window *cfg;
 

-       /* Parse our PCI ranges and request their resources */
-       err = pci_parse_request_of_pci_ranges(dev, resources, 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");
        err = of_address_to_resource(dev->of_node, 0, &cfgres);
        if (err) {
                dev_err(dev, "missing \"reg\" property\n");

-               goto err_out;
+               return ERR_PTR(err);

        }
 
        }
 

-       cfg = pci_ecam_create(dev, &cfgres, bus_range, ops);
-       if (IS_ERR(cfg)) {
-               err = PTR_ERR(cfg);
-               goto err_out;
-       }
+       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;

 
        err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg);
 
        err = devm_add_action_or_reset(dev, gen_pci_unmap_cfg, cfg);

-       if (err) {
-               goto err_out;
-       }
-       return cfg;
+       if (err)
+               return ERR_PTR(err);

 
 

-err_out:
-       pci_free_resource_list(resources);
-       return ERR_PTR(err);
+       return cfg;

 }
 
 int pci_host_common_probe(struct platform_device *pdev)
 }
 
 int pci_host_common_probe(struct platform_device *pdev)


@@ -61,9 +54,7 @@ int pci_host_common_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct pci_host_bridge *bridge;
        struct pci_config_window *cfg;
        struct device *dev = &pdev->dev;
        struct pci_host_bridge *bridge;
        struct pci_config_window *cfg;

-       struct list_head resources;

        const struct pci_ecam_ops *ops;
        const struct pci_ecam_ops *ops;

-       int ret;

 
        ops = of_device_get_match_data(&pdev->dev);
        if (!ops)
 
        ops = of_device_get_match_data(&pdev->dev);
        if (!ops)


@@ -76,7 +67,7 @@ int pci_host_common_probe(struct platform_device *pdev)
        of_pci_check_probe_only();
 
        /* Parse and map our Configuration Space windows */
        of_pci_check_probe_only();
 
        /* Parse and map our Configuration Space windows */

-       cfg = gen_pci_init(dev, &resources, ops);
+       cfg = gen_pci_init(dev, bridge, ops);

        if (IS_ERR(cfg))
                return PTR_ERR(cfg);
 
        if (IS_ERR(cfg))
                return PTR_ERR(cfg);
 


@@ -84,32 +75,22 @@ int pci_host_common_probe(struct platform_device *pdev)
        if (!pci_has_flag(PCI_PROBE_ONLY))
                pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
        if (!pci_has_flag(PCI_PROBE_ONLY))
                pci_add_flags(PCI_REASSIGN_ALL_BUS);
 

-       list_splice_init(&resources, &bridge->windows);
-       bridge->dev.parent = dev;

        bridge->sysdata = cfg;
        bridge->sysdata = cfg;

-       bridge->busnr = cfg->busr.start;

        bridge->ops = (struct pci_ops *)&ops->pci_ops;
        bridge->ops = (struct pci_ops *)&ops->pci_ops;

-       bridge->map_irq = of_irq_parse_and_map_pci;
-       bridge->swizzle_irq = pci_common_swizzle;

 
 

-       ret = pci_host_probe(bridge);
-       if (ret < 0) {
-               pci_free_resource_list(&resources);
-               return ret;
-       }
+       platform_set_drvdata(pdev, bridge);

 
 

-       platform_set_drvdata(pdev, bridge->bus);
-       return 0;
+       return pci_host_probe(bridge);

 }
 EXPORT_SYMBOL_GPL(pci_host_common_probe);
 
 int pci_host_common_remove(struct platform_device *pdev)
 {
 }
 EXPORT_SYMBOL_GPL(pci_host_common_probe);
 
 int pci_host_common_remove(struct platform_device *pdev)
 {

-       struct pci_bus *bus = platform_get_drvdata(pdev);
+       struct pci_host_bridge *bridge = platform_get_drvdata(pdev);

 
        pci_lock_rescan_remove();
 
        pci_lock_rescan_remove();

-       pci_stop_root_bus(bus);
-       pci_remove_root_bus(bus);
+       pci_stop_root_bus(bridge->bus);
+       pci_remove_root_bus(bridge->bus);

        pci_unlock_rescan_remove();
 
        return 0;
        pci_unlock_rescan_remove();
 
        return 0;