From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 817AEC19F2A for ; Thu, 4 Aug 2022 17:59:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C166D84834; Thu, 4 Aug 2022 19:59:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="jNbQX0jw"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="qtZA7JvI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 57BAC84836; Thu, 4 Aug 2022 19:59:50 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F026845F6 for ; Thu, 4 Aug 2022 19:59:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=msuchanek@suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id DBA585BE3B; Thu, 4 Aug 2022 17:59:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1659635987; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=V+bTim15h6LdZiHkSUQDqwCYnQQggBfOoOVHp7HKwaU=; b=jNbQX0jwu6OtLm3nOclfA//hRmgENTAUfOqXB1ahmIm5iSOIYbEX4+NtWNEnyzJ6Nl7k44 XN9eZ4XTvd601B+D7VDpP9gJ0cpTPL7hRIR3KZsHh6y70ebsqhtTksHp/xLUbZuV941xiU dP5t10/oUChZzQH+kaPRTUxwsaKEoSk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1659635987; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=V+bTim15h6LdZiHkSUQDqwCYnQQggBfOoOVHp7HKwaU=; b=qtZA7JvIMAlCsregfvE5wcBvaPOs7jVqoBsHOUu3OMUSvXDQ8APK5fK7qYesDBxogtLzP4 Nowz3ixP3+FHnSAw== Received: from naga.suse.cz (unknown [10.100.224.114]) by relay2.suse.de (Postfix) with ESMTP id AF0F52C141; Thu, 4 Aug 2022 17:59:47 +0000 (UTC) From: Michal Suchanek To: u-boot@lists.denx.de Cc: Michal Suchanek , Simon Glass , =?UTF-8?q?Viktor=20K=C5=99iv=C3=A1k?= , Tomas Hlavacek , Marek Vasut , Pavel Herrmann Subject: [PATCH] dm: core: Do not stop uclass iteration on error. Date: Thu, 4 Aug 2022 19:59:44 +0200 Message-Id: <20220804175944.4130-1-msuchanek@suse.de> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean When probing a device fails NULL pointer is returned, and other devices cannot be iterated. Skip to next device on error instead. Fixes: 6494d708bf ("dm: Add base driver model support") Signed-off-by: Michal Suchanek --- drivers/core/uclass.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 08d9ed82de..ccf7d59141 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -574,16 +574,31 @@ int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent, } #endif +/* Starting from the given device return first device in the uclass that probes successfully */ +static int __uclass_next_device(struct udevice *dev, int ret, struct udevice **devp) +{ + if (!dev) { + *devp = dev; + return 0; + } + while ((ret = uclass_get_device_tail(dev, ret, devp))) { + ret = uclass_find_next_device(&dev); + if (!dev) { + *devp = dev; + return 0; + } + } + + return ret; +} + int uclass_first_device(enum uclass_id id, struct udevice **devp) { - struct udevice *dev; + struct udevice *dev = NULL; int ret; - *devp = NULL; ret = uclass_find_first_device(id, &dev); - if (!dev) - return 0; - return uclass_get_device_tail(dev, ret, devp); + return __uclass_next_device(dev, ret, devp); } int uclass_first_device_err(enum uclass_id id, struct udevice **devp) @@ -604,11 +619,8 @@ int uclass_next_device(struct udevice **devp) struct udevice *dev = *devp; int ret; - *devp = NULL; ret = uclass_find_next_device(&dev); - if (!dev) - return 0; - return uclass_get_device_tail(dev, ret, devp); + return __uclass_next_device(dev, ret, devp); } int uclass_next_device_err(struct udevice **devp) -- 2.37.1