[PATCH u-boot-dm + u-boot-spi v2 6/7] mtd: remove mtd_probe function

[Pali Rohár]

On Tuesday 09 February 2021 15:44:51 Marek Behún wrote:
> The device_probe() function does the same thing as mtd_probe() and
> mtd_probe() is only used in mtd_probe_uclass_mtd_devs(), where the
> probing can be made simpler by using uclass_foreach_dev_probe macro.
> 
> Signed-off-by: Marek Behún <marek.behun at nic.cz>
> Cc: Jagan Teki <jagan at amarulasolutions.com>
> Cc: Priyanka Jain <priyanka.jain at nxp.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Heiko Schocher <hs at denx.de>
> Cc: Jagan Teki <jagan at amarulasolutions.com>

Reviewed-by: Pali Rohár <pali at kernel.org>

> ---
>  drivers/mtd/mtd-uclass.c | 15 ---------------
>  drivers/mtd/mtd_uboot.c  |  9 +++------
>  include/mtd.h            |  1 -
>  3 files changed, 3 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c
> index 9f5f672ba3..4ab84de553 100644
> --- a/drivers/mtd/mtd-uclass.c
> +++ b/drivers/mtd/mtd-uclass.c
> @@ -9,21 +9,6 @@
>  #include <errno.h>
>  #include <mtd.h>
>  
> -/**
> - * mtd_probe - Probe the device @dev if not already done
> - *
> - * @dev: U-Boot device to probe
> - *
> - * @return 0 on success, an error otherwise.
> - */
> -int mtd_probe(struct udevice *dev)
> -{
> -	if (device_active(dev))
> -		return 0;
> -
> -	return device_probe(dev);
> -}
> -
>  /*
>   * Implement a MTD uclass which should include most flash drivers.
>   * The uclass private is pointed to mtd_info.
> diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
> index 7fb72eb1f4..865e9ae4cb 100644
> --- a/drivers/mtd/mtd_uboot.c
> +++ b/drivers/mtd/mtd_uboot.c
> @@ -9,6 +9,7 @@
>  #include <malloc.h>
>  #include <dm/device.h>
>  #include <dm/uclass-internal.h>
> +#include <dm/uclass.h>
>  #include <linux/err.h>
>  #include <linux/mtd/mtd.h>
>  #include <linux/mtd/partitions.h>
> @@ -105,13 +106,9 @@ int mtd_search_alternate_name(const char *mtdname, char *altname,
>  static void mtd_probe_uclass_mtd_devs(void)
>  {
>  	struct udevice *dev;
> -	int idx = 0;
>  
> -	/* Probe devices with DM compliant drivers */
> -	while (!uclass_find_device(UCLASS_MTD, idx, &dev) && dev) {
> -		mtd_probe(dev);
> -		idx++;
> -	}
> +	uclass_foreach_dev_probe(UCLASS_MTD, dev)
> +		;
>  }
>  #else
>  static void mtd_probe_uclass_mtd_devs(void) { }
> diff --git a/include/mtd.h b/include/mtd.h
> index b0f8693386..b569331edb 100644
> --- a/include/mtd.h
> +++ b/include/mtd.h
> @@ -8,7 +8,6 @@
>  
>  #include <linux/mtd/mtd.h>
>  
> -int mtd_probe(struct udevice *dev);
>  int mtd_probe_devices(void);
>  
>  void board_mtdparts_default(const char **mtdids, const char **mtdparts);
> -- 
> 2.26.2
>