[PATCH 07/10] dm: core: Allow devres to be disabled in SPL

[Angus Ainslie]

On 2022-03-27 13:26, Simon Glass wrote:
> At present if devres is enabled in U-Boot proper it is enabled in SPL.
> We don't normally want it there, so disable it.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Tested-by: Angus Ainslie <angus at akkea.ca>

> ---
> 
>  drivers/core/Makefile        | 2 +-
>  drivers/core/device.c        | 2 +-
>  include/dm/device-internal.h | 6 +++---
>  include/dm/device.h          | 2 +-
>  include/dm/devres.h          | 4 ++--
>  test/dm/Makefile             | 2 +-
>  6 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/core/Makefile b/drivers/core/Makefile
> index 5edd4e41357..0cbc3ab217e 100644
> --- a/drivers/core/Makefile
> +++ b/drivers/core/Makefile
> @@ -4,7 +4,7 @@
> 
>  obj-y	+= device.o fdtaddr.o lists.o root.o uclass.o util.o
>  obj-$(CONFIG_$(SPL_TPL_)ACPIGEN) += acpi.o
> -obj-$(CONFIG_DEVRES) += devres.o
> +obj-$(CONFIG_$(SPL_TPL_)DEVRES) += devres.o
>  obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE)	+= device-remove.o
>  obj-$(CONFIG_$(SPL_)SIMPLE_BUS)	+= simple-bus.o
>  obj-$(CONFIG_SIMPLE_PM_BUS)	+= simple-pm-bus.o
> diff --git a/drivers/core/device.c b/drivers/core/device.c
> index 1b356f12dd8..b7ce8544140 100644
> --- a/drivers/core/device.c
> +++ b/drivers/core/device.c
> @@ -68,7 +68,7 @@ static int device_bind_common(struct udevice
> *parent, const struct driver *drv,
>  	INIT_LIST_HEAD(&dev->sibling_node);
>  	INIT_LIST_HEAD(&dev->child_head);
>  	INIT_LIST_HEAD(&dev->uclass_node);
> -#ifdef CONFIG_DEVRES
> +#if CONFIG_IS_ENABLED(DEVRES)
>  	INIT_LIST_HEAD(&dev->devres_head);
>  #endif
>  	dev_set_plat(dev, plat);
> diff --git a/include/dm/device-internal.h 
> b/include/dm/device-internal.h
> index c420726287e..2fc41f31f5a 100644
> --- a/include/dm/device-internal.h
> +++ b/include/dm/device-internal.h
> @@ -396,7 +396,7 @@ fdt_addr_t simple_bus_translate(struct udevice
> *dev, fdt_addr_t addr);
>  #define DM_UCLASS_ROOT_S_NON_CONST	(((gd_t *)gd)->uclass_root_s)
> 
>  /* device resource management */
> -#ifdef CONFIG_DEVRES
> +#if CONFIG_IS_ENABLED(DEVRES)
> 
>  /**
>   * devres_release_probe - Release managed resources allocated after 
> probing
> @@ -416,7 +416,7 @@ void devres_release_probe(struct udevice *dev);
>   */
>  void devres_release_all(struct udevice *dev);
> 
> -#else /* ! CONFIG_DEVRES */
> +#else /* ! DEVRES */
> 
>  static inline void devres_release_probe(struct udevice *dev)
>  {
> @@ -426,7 +426,7 @@ static inline void devres_release_all(struct 
> udevice *dev)
>  {
>  }
> 
> -#endif /* ! CONFIG_DEVRES */
> +#endif /* DEVRES */
> 
>  static inline int device_notify(const struct udevice *dev, enum 
> event_t type)
>  {
> diff --git a/include/dm/device.h b/include/dm/device.h
> index cb52a0997c8..3d8961f9ac6 100644
> --- a/include/dm/device.h
> +++ b/include/dm/device.h
> @@ -184,7 +184,7 @@ struct udevice {
>  #if CONFIG_IS_ENABLED(OF_REAL)
>  	ofnode node_;
>  #endif
> -#ifdef CONFIG_DEVRES
> +#if CONFIG_IS_ENABLED(DEVRES)
>  	struct list_head devres_head;
>  #endif
>  #if CONFIG_IS_ENABLED(DM_DMA)
> diff --git a/include/dm/devres.h b/include/dm/devres.h
> index 0ab277ec38e..697534aa5be 100644
> --- a/include/dm/devres.h
> +++ b/include/dm/devres.h
> @@ -30,7 +30,7 @@ struct devres_stats {
>  	int total_size;
>  };
> 
> -#ifdef CONFIG_DEVRES
> +#if CONFIG_IS_ENABLED(DEVRES)
> 
>  #ifdef CONFIG_DEBUG_DEVRES
>  void *__devres_alloc(dr_release_t release, size_t size, gfp_t gfp,
> @@ -207,7 +207,7 @@ void devm_kfree(struct udevice *dev, void *ptr);
>  /* Get basic stats on allocations */
>  void devres_get_stats(const struct udevice *dev, struct devres_stats 
> *stats);
> 
> -#else /* ! CONFIG_DEVRES */
> +#else /* ! DEVRES */
> 
>  static inline void *devres_alloc(dr_release_t release, size_t size, 
> gfp_t gfp)
>  {
> diff --git a/test/dm/Makefile b/test/dm/Makefile
> index d46552fbf32..9a1a904d906 100644
> --- a/test/dm/Makefile
> +++ b/test/dm/Makefile
> @@ -32,7 +32,7 @@ obj-$(CONFIG_CLK) += clk.o clk_ccf.o
>  obj-$(CONFIG_CPU) += cpu.o
>  obj-$(CONFIG_CROS_EC) += cros_ec.o
>  obj-$(CONFIG_PWM_CROS_EC) += cros_ec_pwm.o
> -obj-$(CONFIG_DEVRES) += devres.o
> +obj-$(CONFIG_$(SPL_TPL_)DEVRES) += devres.o
>  obj-$(CONFIG_DMA) += dma.o
>  obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi_host.o
>  obj-$(CONFIG_DM_DSA) += dsa.o