Message ID | 20180511162028.20616-13-brgl@bgdev.pl (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Bartosz, On Fri, May 11, 2018 at 6:20 PM, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Check the relevant flag in the device node and skip the allocation > part for devices that were populated early. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Thanks for your patch! > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -196,9 +197,17 @@ static struct platform_device *of_platform_device_create_pdata( > of_node_test_and_set_flag(np, OF_POPULATED)) > return NULL; > > - dev = of_device_alloc(np, bus_id, parent); > - if (!dev) > - goto err_clear_flag; > + if (of_node_check_flag(np, OF_POPULATED_EARLY)) { > + dev = of_early_to_platform_device(np); > + if (IS_ERR(dev)) > + goto err_clear_flag; > + > + of_device_init(dev, np, bus_id, parent); > + } else { > + dev = of_device_alloc(np, bus_id, parent); > + if (!dev) > + goto err_clear_flag; > + } The above may become cleaner if: 1. of_early_to_platform_device() would return NULL instead -ENOENT, 2. of_device_alloc() would be split in alloc and init phases, too. Then you can do: dev = of_node_check_flag(np, OF_POPULATED_EARLY) ? of_early_to_platform_device(np) : __of_device_alloc(np, bus_id, parent); if (!dev) goto err_clear_flag; of_device_init(dev, np, bus_id, parent); Gr{oetje,eeting}s, Geert
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 0e554fe1f325..91760e2d3dc7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,6 +21,7 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/early_platform.h> const struct of_device_id of_default_bus_match_table[] = { { .compatible = "simple-bus", }, @@ -196,9 +197,17 @@ static struct platform_device *of_platform_device_create_pdata( of_node_test_and_set_flag(np, OF_POPULATED)) return NULL; - dev = of_device_alloc(np, bus_id, parent); - if (!dev) - goto err_clear_flag; + if (of_node_check_flag(np, OF_POPULATED_EARLY)) { + dev = of_early_to_platform_device(np); + if (IS_ERR(dev)) + goto err_clear_flag; + + of_device_init(dev, np, bus_id, parent); + } else { + dev = of_device_alloc(np, bus_id, parent); + if (!dev) + goto err_clear_flag; + } dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data;