Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp770388lqp; Thu, 21 Mar 2024 15:23:23 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXgRj3q6eQDXxQodcWGzHTSGY3NiG7ddMxfuSUskaG7zDLVzUbnbMyUt8hIyuDVHRbjxu4v4ODSIQ3cf3y64ps0P3tdv5Zp3mMRYLOblw== X-Google-Smtp-Source: AGHT+IHVy2LW415MPlsJgvJF3BCaTa6xoQ2roAC2iA34oLbs5GH3FvQA5e7HmBZGk8TA/5sEPVky X-Received: by 2002:a50:cd94:0:b0:567:2cf:1ecc with SMTP id p20-20020a50cd94000000b0056702cf1eccmr376325edi.30.1711059802916; Thu, 21 Mar 2024 15:23:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711059802; cv=pass; d=google.com; s=arc-20160816; b=a9F+A6zxFsdr+WOQbEmNWp2C2zFed1nKcjXM0BMwXmYbBHnNb6PiOBE8LHMz8YIw+J e5hWbbcBuhLG++T/Bypwp2tTFtzjAKQcLi0EhqJEA0DiUJtdvZN1YeXcE934qktc0r2L Dxsi41Kx78FkKRTnsJpWMUv6098q5WqGdnBcs8vfRIXl1rqbP6BbrKeCILED71LULzWA C11oUP06nQEYeM6Y6h4Q+T3rWIq0BUNfG0nQZhDmXFeMsysNZeHpAj3l1zCMC6Vy1ssx hP6ZEZI/vuuMOMVirfWXkHX4B1s6GuvvDM6SMJXAkb/9jIjS9O1nc/Ly1qMxMosZulLK JYnQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=BkC8XuIKTuUKOaDN8fSurixoB+8r13LjYNJaXfm1bVQ=; fh=SYj1u3CvL0rDB41mAiO9tSuS7dAvJToO8R7oHx/VXbA=; b=OW5TugOsyWy8Zt706S0JfROj8wMUNKPjPcj2aICW71N0EBJBjIWZBUz8h2vWURHYJa W5T0hMvpVjH2A9EjZdsg+6xC46ASmwVYqGi8UjumMCq4nkpFtMpSOvYI84KMbMICHM9D Jmby84RJCMsemL/8W6661/Y3mE4rBLwRVAmamofYWjczzbnuo2QdP/4zuHdsr2E7AVio hIm8OvVBF/VbqBmOh0ySUqLElXS9YMjX4ue09/yP5lFp5V1FB3rSXcrBW8qyKZehyDMK UAKThaAVD4F5miWQOwwMgegj3sO9LMrl8dkaxMnOqvGOefkCElYwuWHRpF9M+iptgOft DOPQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=oGVFovrj; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-110752-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-110752-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id s18-20020aa7c552000000b005689f5401aasi293430edr.472.2024.03.21.15.23.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 15:23:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-110752-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=oGVFovrj; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-110752-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-110752-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A18E01F21975 for ; Thu, 21 Mar 2024 22:23:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2967F136678; Thu, 21 Mar 2024 22:23:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="oGVFovrj" Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C17A2136980 for ; Thu, 21 Mar 2024 22:23:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711059796; cv=none; b=V/B+o9nU+Z56X+uciGPklq1eQ9VZUusRrkhbOo6MTd2+LlmfdC91nMs7BSzchNhkPHUP1d4pK0EzcLRA7JA73UanZb4pNwUkpSBqJIOQI6RwOS6lAyF6cb/n5FpiVwTLNnfKS9Jog5NAa27LbYKqKgtVYz6JBvNSuC1YYv/YPdg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711059796; c=relaxed/simple; bh=NU20P7WmOfIGc97qZsPprgwsBgMXCuHAhTpBT4XCf18=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=vDXj1h9rcqwuQDRWQEsAMCQZovp6ZIseZ990o3EzrIUhmqvhCQFJ1QBX0McxGQ/Q9ex0Xrus9+1LcVrbJpMcdD8oUOPgdCZDSyqfHHDiVvvaUyWoNQBa+dFoSo39oNo0nBpEonbsUMs8806Ynxie4sNHl1GgIo5i/c6q76C2ObY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=oGVFovrj; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1711059792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=BkC8XuIKTuUKOaDN8fSurixoB+8r13LjYNJaXfm1bVQ=; b=oGVFovrjW70JeOCFG1ijeT2lvhnonEoyMXKz49pNekvyIe9GktpJ5ZiBFseGL7JC+u+0W1 NU+su6w0n3HaHmG2xtgkoO0+IKKi3nEAT7lmDyU4SaZyr449rPHZfRC0yjugVCGrKFV0DF k1qTPjCKSDuE/Vmak7+9XVDIvGY/AbU= From: Sui Jingfeng To: Maarten Lankhorst Cc: Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Douglas Anderson , Laurent Pinchart , Biju Das , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sui Jingfeng Subject: [PATCH] drm/debugfs: Drop conditionals around of_node pointers Date: Fri, 22 Mar 2024 06:22:58 +0800 Message-Id: <20240321222258.1440130-1-sui.jingfeng@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Having conditional around the of_node pointer of the drm_bridge structure turns out to make driver code use ugly #ifdef blocks. Drop the conditionals to simplify debugfs. Fixes: d8dfccde2709 ("drm/bridge: Drop conditionals around of_node pointers") Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/drm_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 08fcefd804bc..28a471fe4bc8 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -597,10 +597,10 @@ static int bridges_show(struct seq_file *m, void *data) drm_printf(&p, "\ttype: [%d] %s\n", bridge->type, drm_get_connector_type_name(bridge->type)); -#ifdef CONFIG_OF + if (bridge->of_node) drm_printf(&p, "\tOF: %pOFfc\n", bridge->of_node); -#endif + drm_printf(&p, "\tops: [0x%x]", bridge->ops); if (bridge->ops & DRM_BRIDGE_OP_DETECT) drm_puts(&p, " detect"); -- 2.34.1