On Fri, Jul 25, 2014 at 03:23:53PM +0100, Pawel Moll wrote:
> ... describing the root of the device tree, so one can write
> a platform driver initializing the platform.
> 
> Signed-off-by: Pawel Moll <pawel.m...@arm.com>
> ---
>  drivers/base/platform.c         | 20 ++++++++++++++------
>  include/linux/platform_device.h |  2 +-
>  2 files changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index eee48c4..9caffa7 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -30,8 +30,8 @@
>  /* For automatically allocated device IDs */
>  static DEFINE_IDA(platform_devid_ida);
>  
> -struct device platform_bus = {
> -     .init_name      = "platform",
> +struct platform_device platform_bus = {
> +     .name   = "platform",
>  };
>  EXPORT_SYMBOL_GPL(platform_bus);
>  
> @@ -300,7 +300,7 @@ int platform_device_add(struct platform_device *pdev)
>               return -EINVAL;
>  
>       if (!pdev->dev.parent)
> -             pdev->dev.parent = &platform_bus;
> +             pdev->dev.parent = &platform_bus.dev;
>  
>       pdev->dev.bus = &platform_bus_type;
>  
> @@ -946,12 +946,20 @@ int __init platform_bus_init(void)
>  
>       early_platform_cleanup();
>  
> -     error = device_register(&platform_bus);
> +     dev_set_name(&platform_bus.dev, "%s", platform_bus.name);
> +     error = device_register(&platform_bus.dev);
>       if (error)
>               return error;
>       error =  bus_register(&platform_bus_type);
> -     if (error)
> -             device_unregister(&platform_bus);
> +     if (!error) {
> +#ifdef CONFIG_OF
> +             platform_bus.dev.of_node = of_allnodes;
> +#endif

Why are you doing this?  The original code didn't do it and all was
fine, right?  What changes here?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to