Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 63.35.35.123 as permitted sender) receiver=protection.outlook.com;
 client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com;
From:   Mihail Atanassov <Mihail.Atanassov@arm.com>
To:     "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
CC:     Mihail Atanassov <Mihail.Atanassov@arm.com>, nd <nd@arm.com>,
        Andrzej Hajda <a.hajda@samsung.com>,
        Neil Armstrong <narmstrong@baylibre.com>,
        Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
        Jonas Karlman <jonas@kwiboo.se>,
        Jernej Skrabec <jernej.skrabec@siol.net>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 11/35] drm/bridge/analogix: Use drm_bridge_init()
Thread-Topic: [PATCH v3 11/35] drm/bridge/analogix: Use drm_bridge_init()
Thread-Index: AQHVuoBlpOm1s13reUyMoPETVyW9PQ==
Date:   Tue, 24 Dec 2019 17:34:30 +0000
Message-ID: <20191224173408.25624-12-mihail.atanassov@arm.com>
References: <20191224173408.25624-1-mihail.atanassov@arm.com>
In-Reply-To: <20191224173408.25624-1-mihail.atanassov@arm.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
Authentication-Results-Original: spf=none (sender IP is )
 smtp.mailfrom=Mihail.Atanassov@arm.com; 
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-publictraffictype: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: d8a0f491-1549-425f-16bc-08d788978cd3
X-MS-TrafficTypeDiagnostic: VI1PR08MB2702:|VI1PR08MB2702:|DB6PR08MB2869:
x-ms-exchange-transport-forked: True
X-Microsoft-Antispam-PRVS: <DB6PR08MB28694B039D59E3CF569581878F290@DB6PR08MB2869.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
x-ms-oob-tlc-oobclassifiers: OLM:3826;OLM:3826;
x-forefront-prvs: 0261CCEEDF
X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4636009)(346002)(376002)(136003)(366004)(396003)(39860400002)(189003)(199004)(81156014)(8676002)(478600001)(36756003)(4326008)(8936002)(66446008)(64756008)(66946007)(66476007)(66556008)(26005)(186003)(44832011)(6506007)(2616005)(81166006)(71200400001)(316002)(2906002)(1076003)(6512007)(54906003)(6916009)(6486002)(86362001)(5660300002)(52116002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB2702;H:VI1PR08MB4078.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: arm.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: 670oSzKSuyj3Jef60y6ZI1pM2O7QWQaoVSDHAbqei9FeP7p6z5rsiaxy6Qtcl/lR/gDzY7XaO2F7DFsNjMd48f9VlN0tEYHTPyEvMkLW6NiUsD/h1OK4295C5uBXoPbjcC+yMlZ1HH8240aurjr6KPb5/enWPX024GY1PIhI97xmK0HWPzzJh7sNtxU/j1jDHYRkpZQSN+yk2wVAp7OjOKPSK3fXOa+JUEphBz715+mZ8taZgqQsT9bPlBQfwJC9VCvmAjBcuBy3wDM1Ep7NNDsF6BCFl4SNDqsXFTUsUs5r6MK9j0XjUsJZ7Nh6zFBfr8msLSuRUZ3R5lMwYEjnomB5LXas+jEO/1abJ3Au98vpI4qIpmq8p+ONJtTSZuSs8UMkttG+lyo3uZ8sChpyRN2RlIH9hZKHeEd9yUh3/UTT8iUD1LMHgxlw7+H0ulD0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2702
Original-Authentication-Results: spf=none (sender IP is )
 smtp.mailfrom=Mihail.Atanassov@arm.com; 
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT043.eop-EUR03.prod.protection.outlook.com
X-Forefront-Antispam-Report: CIP:63.35.35.123;IPV:CAL;SCL:-1;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(136003)(39860400002)(376002)(396003)(346002)(199004)(189003)(36756003)(26005)(70206006)(336012)(70586007)(76130400001)(356004)(186003)(6512007)(26826003)(81156014)(54906003)(81166006)(6506007)(5660300002)(316002)(6486002)(4326008)(8936002)(2616005)(8676002)(2906002)(1076003)(6862004)(478600001)(86362001)(36906005);DIR:OUT;SFP:1101;SCL:1;SRVR:DB6PR08MB2869;H:64aa7808-outbound-1.mta.getcheckrecipient.com;FPR:;SPF:Pass;LANG:en;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;A:1;MX:1;
X-MS-Office365-Filtering-Correlation-Id-Prvs: 3d4fb853-b5df-46d2-63eb-08d78897883b
NoDisclaimer: True
X-Forefront-PRVS: 0261CCEEDF
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: dJz+3Z9KBNFdGT6eTHwxMY/ZQo60qQmz849AJWs2yB2x1N6YFDz4K/2xxWnOY7giXXaUyqxP44Whm232P9AUd8cU+Svu3mQgmWr7Pd6qJB94qDd7EYzKyciJmV3+xuBlJVy466RbZNfMDrzW5UiXOaIVX3mgg9rUMtK0voAU1cs6iakS9aNyJuGjLnXtvmLonF2A13q0Hz4bT2Kb6TMA/4xm7f0WhLVI+sFGNVEq+AW2IqCbrczzh/x6t0wRRenFaJiOWyIPTsg+0K5AjDcQrB8lv6MlcuEJaerXNZKynma/1MtRpNJGQ2dSSDvHbVktq08EaZ/U25wen0mzzQGB+ZVNQ5Tf/3ykk6690KTiAAbd28mWJRNpK3XvmNXWysjpZiu0XyhWNZ6XRatqrXGKsgsuHciAmrmsiRZ35RKZH0YQYI42GBrkMB/XzR02O0+x
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2019 17:34:37.9257
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: d8a0f491-1549-425f-16bc-08d788978cd3
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2869
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

No functional change.

The setting of bridge->of_node by drm_bridge_init() in
analogix_dp_core.c is safe, since ->of_node isn't used directly and the
bridge isn't published with drm_bridge_add().

v3:
 - drop driver_private argument (Laurent)
 - pass correct struct device pointer to drm_bridge_init (Laurent)

Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>
---
 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 5 ++---
 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 8 ++------
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/g=
pu/drm/bridge/analogix/analogix-anx6345.c
index 5b806d23fcb3..62404b0f2fc1 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -696,8 +696,6 @@ static int anx6345_i2c_probe(struct i2c_client *client,
=20
 	mutex_init(&anx6345->lock);
=20
-	anx6345->bridge.of_node =3D client->dev.of_node;
-
 	anx6345->client =3D client;
 	i2c_set_clientdata(client, anx6345);
=20
@@ -760,7 +758,8 @@ static int anx6345_i2c_probe(struct i2c_client *client,
 	/* Look for supported chip ID */
 	anx6345_poweron(anx6345);
 	if (anx6345_get_chip_id(anx6345)) {
-		anx6345->bridge.funcs =3D &anx6345_bridge_funcs;
+		drm_bridge_init(&anx6345->bridge, &client->dev,
+				&anx6345_bridge_funcs, NULL);
 		drm_bridge_add(&anx6345->bridge);
=20
 		return 0;
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/g=
pu/drm/bridge/analogix/analogix-anx78xx.c
index 7463537950cb..e30df40ec512 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
@@ -1214,10 +1214,6 @@ static int anx78xx_i2c_probe(struct i2c_client *clie=
nt,
=20
 	mutex_init(&anx78xx->lock);
=20
-#if IS_ENABLED(CONFIG_OF)
-	anx78xx->bridge.of_node =3D client->dev.of_node;
-#endif
-
 	anx78xx->client =3D client;
 	i2c_set_clientdata(client, anx78xx);
=20
@@ -1321,8 +1317,8 @@ static int anx78xx_i2c_probe(struct i2c_client *clien=
t,
 		goto err_poweroff;
 	}
=20
-	anx78xx->bridge.funcs =3D &anx78xx_bridge_funcs;
-
+	drm_bridge_init(&anx78xx->bridge, &client->dev, &anx78xx_bridge_funcs,
+			NULL);
 	drm_bridge_add(&anx78xx->bridge);
=20
 	/* If cable is pulled out, just poweroff and wait for HPD event */
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/g=
pu/drm/bridge/analogix/analogix_dp_core.c
index 56ea3be27f2b..29693d48682e 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1571,13 +1571,13 @@ static const struct drm_bridge_funcs analogix_dp_br=
idge_funcs =3D {
 	.attach =3D analogix_dp_bridge_attach,
 };
=20
-static int analogix_dp_attach_bridge(struct drm_device *drm_dev,
+static int analogix_dp_attach_bridge(struct device *dev,
+				     struct drm_device *drm_dev,
 				     struct analogix_dp_device *dp)
 {
 	int ret;
=20
-	dp->bridge.funcs =3D &analogix_dp_bridge_funcs;
-
+	drm_bridge_init(&dp->bridge, dev, &analogix_dp_bridge_funcs, NULL);
 	ret =3D drm_bridge_attach(dp->encoder, &dp->bridge, NULL);
 	if (ret)
 		return -EINVAL;
@@ -1745,7 +1745,7 @@ analogix_dp_bind(struct device *dev, struct drm_devic=
e *drm_dev,
=20
 	pm_runtime_enable(dev);
=20
-	ret =3D analogix_dp_attach_bridge(drm_dev, dp);
+	ret =3D analogix_dp_attach_bridge(dev, drm_dev, dp);
 	if (ret) {
 		DRM_ERROR("failed to attach bridge (%d)\n", ret);
 		goto err_disable_pm_runtime;
--=20
2.24.0