From patchwork Thu Aug 31 08:09:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c792:0:b0:3f2:4152:657d with SMTP id b18csp122899vqu; Thu, 31 Aug 2023 02:30:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQAa9OsJj1ojniqHvNcdFXowWttx7UE3ieNjragy4p7NtQZicz6F9d2EyJYDKXbmxGusWI X-Received: by 2002:a05:6870:1ca:b0:19f:5c37:abb9 with SMTP id n10-20020a05687001ca00b0019f5c37abb9mr5321630oad.12.1693474234829; Thu, 31 Aug 2023 02:30:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693474234; cv=none; d=google.com; s=arc-20160816; b=OH+bkbLCUdI5GAZhAtIiKrp5fZ8QdZW2/Bvw54aRT3LczK/rQGPNiKHpjsqc7Itj0M JVrehmjvuIKoxkVJipTbaNuSaX/J7TaZP5xqO2yaBzF/qttI3SoNSOEPhXb6NqCT7S4Y A3w7e1NSix6dK+hgV54JbWbPe4kkK7YMBPoQ+62xmNXPRiYq5IvnoioTzCWhv01raOmu trJGrXAE6wl59yVKX9k9wD305tIZ0+e+DDdM7XYYxfxf2ldREMFd9UKvApqtutLHVUf/ mNzbEjSWb12GaH2dby2JILPlfJ1YcrbwVcZZO0oAfFiboNchGYxwqWxePfBYW4SorqdS DyLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qGOSPmjG1ZZMiUjimzrjai7WQOPNH2MlvNsTG0lP/yw=; fh=YwJMbeg+3jadkqx++b8GHN/wxtSTxMsJ/Z9NPf7adNs=; b=lrb6ezN+1PzgnXnazZR2aUK653HQRdTT2SUzBzr5hZ7/fjkv2mx2X/6R9YuLrVAvEN S2GVWjIOCu5BU+JKKrCoHygctUjv1QPyfKMYa9nbF6JIcLDrqFio8oge0KsPV5qMYW0L eqOHxsZd47jNRBmysERDDxEcHJWUA6hQn56+beyFh/vTGT1D9WmtIIApPnpxDf+hl9qq tlhIhJ55qROa81ZfzxH4FOJ0OCqYZd4oRQasKQIstP6iKsRfgLHMJFNACcTcluoiU334 X9YO2yAGhwEr7mOZJQPvfRTQVvIRoo926sMGl1ccIW7JAzVrXZ5hDeZHQmtcFoTDvUe8 1UOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kf11-20020a17090305cb00b001bf15337494si821676plb.401.2023.08.31.02.30.05; Thu, 31 Aug 2023 02:30:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244059AbjHaIKI (ORCPT + 99 others); Thu, 31 Aug 2023 04:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242791AbjHaIKF (ORCPT ); Thu, 31 Aug 2023 04:10:05 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5AFFFCE7 for ; Thu, 31 Aug 2023 01:09:58 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,216,1688396400"; d="scan'208";a="178287328" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 31 Aug 2023 17:09:58 +0900 Received: from localhost.localdomain (unknown [10.226.92.179]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 780704010DFE; Thu, 31 Aug 2023 17:09:52 +0900 (JST) From: Biju Das To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , David Airlie , Daniel Vetter Cc: Biju Das , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Douglas Anderson , Laurent Pinchart Subject: [PATCH v6 2/4] drm/bridge: Drop conditionals around of_node pointers Date: Thu, 31 Aug 2023 09:09:36 +0100 Message-Id: <20230831080938.47454-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831080938.47454-1-biju.das.jz@bp.renesas.com> References: <20230831080938.47454-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775736439261390158 X-GMAIL-MSGID: 1775736439261390158 This patch is based on commit c9e358dfc4a8 ("driver-core: remove conditionals around devicetree pointers"). 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 drivers. While this slightly increases the size of struct drm_bridge on non-OF system, the number of bridges used today and foreseen tomorrow on those systems is very low, so this shouldn't be an issue. So drop #if conditionals by adding struct device_node forward declaration. Suggested-by: Douglas Anderson Signed-off-by: Biju Das Reviewed-by: Douglas Anderson Reviewed-by: Laurent Pinchart --- v5->v6: * Updated commit description. * Added Rb tag from Douglas Anderson and Laurent v5: * Split from patch#2 * Updated commit description * Added struct device_node forward declaration. --- include/drm/drm_bridge.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index c339fc85fd07..843736627f60 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -32,6 +32,8 @@ #include #include +struct device_node; + struct drm_bridge; struct drm_bridge_timings; struct drm_connector; @@ -716,10 +718,8 @@ struct drm_bridge { struct drm_encoder *encoder; /** @chain_node: used to form a bridge chain */ struct list_head chain_node; -#ifdef CONFIG_OF /** @of_node: device node pointer to the bridge */ struct device_node *of_node; -#endif /** @list: to keep track of all added bridges */ struct list_head list; /**