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 0318CC433F5 for ; Sat, 29 Jan 2022 21:58:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57B8C836A9; Sat, 29 Jan 2022 22:58:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="MmP18XS0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C58C18192A; Sat, 29 Jan 2022 22:58:46 +0100 (CET) Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 03CF382FA3 for ; Sat, 29 Jan 2022 22:58:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id s1so8456003ilj.7 for ; Sat, 29 Jan 2022 13:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YKKbKfzW1SxLbC9t4iW2jYPFos1Xioui1hgeoWTYe7U=; b=MmP18XS0fwW3pQX4pynxEirEI9CCoEZhALX4uzLICZMdN9CEq0dMB/pTqHYjQ742qJ 9WjKXe8PuRRzcdw4/klrG6/uUF9G/REcqH3QshHtSc9BARVEmn9sxsoFaVf5OrYRfHpx zjHEvZ7Gx6SB1g9xzW2IdvB1OLkrS4KWkL7K4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YKKbKfzW1SxLbC9t4iW2jYPFos1Xioui1hgeoWTYe7U=; b=QXTVPiDm4+OobiKCrFL9fK6HBNnCc1a0VZMhDZHFcYJEdTXH8oAjJNymHQpKRnyDKL xBRntyk8zPExdz21sVZJ+Ixr+POzsOtCWPePUfqtwxNiH7FJtmIFdaNN9GuBLMtXWKKL lXU/d/pBVwUCgcAV4FVnO/XBOgqKwRe1a5cldp0focsEeBl+dFFQxUPMgRg1lpy1ZS3l P2tiVdyF0+VUiZcHI5TOIy3dvscO+uYIzsaUV+Gja2kK9fnSM0iPSZjO9odUJHxS8042 FQiQzgrVFNJqZ79vTUpD4IOjKWrCU3RFkWyP0FxRkoJVoPcJjXuA7rsQz88rfx5wG6OE e+SA== X-Gm-Message-State: AOAM5324JsT5l+zpIdI4q96vhDvMj9zjLUkPuDmfj8vaHzn2GUilNfHe y+5txCl6CUY2sA69SZ+9SvOvQnllyKDEQQ== X-Google-Smtp-Source: ABdhPJy3d165lsz6WFmPUbMHOD+svLMA17sbtwIMBkalwBiKdWy8fq1pL4wsCnzsBjry2D++d5QXuA== X-Received: by 2002:a92:bd09:: with SMTP id c9mr9544930ile.232.1643493522659; Sat, 29 Jan 2022 13:58:42 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id o11sm15693953ilm.20.2022.01.29.13.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jan 2022 13:58:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Simon Glass , Alexander Graf Subject: [PATCH v2 2/3] efi: Use device_get_uclass_id() where appropriate Date: Sat, 29 Jan 2022 14:58:38 -0700 Message-Id: <20220129215839.535809-2-sjg@chromium.org> X-Mailer: git-send-email 2.35.0.rc2.247.g8bbb082509-goog In-Reply-To: <20220129215839.535809-1-sjg@chromium.org> References: <20220129215839.535809-1-sjg@chromium.org> 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.5 at phobos.denx.de X-Virus-Status: Clean Use this function rather than following the pointers, since it is there for this purpose. Add the uclass name to the debug call at the end of dp_fill() since it is quite useful. Signed-off-by: Simon Glass --- Changes in v2: - Drop the uclass id lib/efi_loader/efi_device_path.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index c61f4859330..75ab4de7070 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -494,7 +494,7 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev) if (!dev || !dev->driver) return sizeof(ROOT); - switch (dev->driver->id) { + switch (device_get_uclass_id(dev)) { case UCLASS_ROOT: case UCLASS_SIMPLE_BUS: /* stop traversing parents at this point: */ @@ -579,7 +579,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) if (!dev || !dev->driver) return buf; - switch (dev->driver->id) { + switch (device_get_uclass_id(dev)) { case UCLASS_ROOT: case UCLASS_SIMPLE_BUS: { /* stop traversing parents at this point: */ @@ -759,9 +759,9 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) return &udp[1]; } default: - debug("%s(%u) %s: unhandled device class: %s (%u)\n", - __FILE__, __LINE__, __func__, - dev->name, dev->driver->id); + /* If the uclass driver is missing, this will show NULL */ + log_debug("unhandled device class: %s (%s)\n", dev->name, + dev_get_uclass_name(dev)); return dp_fill(buf, dev->parent); } } -- 2.35.0.rc2.247.g8bbb082509-goog