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 03/35] drm/bridge/synopsys: Stop using
 drm_bridge->driver_private
Thread-Topic: [PATCH v3 03/35] drm/bridge/synopsys: Stop using
 drm_bridge->driver_private
Thread-Index: AQHVuoBgDD48T29lSEihrvDPdP2k7g==
Date:   Tue, 24 Dec 2019 17:34:22 +0000
Message-ID: <20191224173408.25624-4-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: cc48e0e9-1e21-4a94-9fcc-08d788978908
X-MS-TrafficTypeDiagnostic: VI1PR08MB2702:|VI1PR08MB2702:|AM0PR08MB4243:
x-ms-exchange-transport-forked: True
X-Microsoft-Antispam-PRVS: <AM0PR08MB42436A92A03E2912C0EE996A8F290@AM0PR08MB4243.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
x-ms-oob-tlc-oobclassifiers: OLM:418;OLM:418;
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: 5O3rSr2i+a+tA0amttawEsipuBxuQ9aYk9nUBG3FXI8lsJwTQgFjeN36i9z1Baeg8K33aVK5psq9kZcnhjhWZPeOGX2q4fKb5hKPLHY2OV58+jTNCWvuuz5xGEh/pwglQ8RUV7L54Ncjlv+g2IMvU+VCRf+hm+EW+PGn1mMigzQ/GoLrQffMrkgVhTnuBNIQ5EkmtjNGrlH/dhqEtjnOQoJD88x1dUVS8SaIIS5Qqa5KQ2b+CjOzZ03gBo/JohsUXk4t09Da806A+hR2XcA3tHFMH157+tX2Kw7y7MUJ1rMkafq7hiX4NF95kZn2/lvNZ8BSgOxuUy2ZSMAeNHuWTIGjypviavzMkx4TZQJ68Yz0RTikdXcbCTZmOuNI5sMWUm8nSqk0FCqDb0+frqY3fFL2bJ+PtvemHQtJ+D6VViqbNp53A1ov6n7g3wtwh2bX
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: DB5EUR03FT059.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)(346002)(396003)(39860400002)(376002)(199004)(189003)(81156014)(81166006)(6506007)(356004)(8676002)(76130400001)(8936002)(6512007)(2616005)(2906002)(86362001)(336012)(1076003)(70206006)(54906003)(70586007)(5660300002)(316002)(186003)(478600001)(6486002)(36756003)(26005)(4326008)(26826003)(6862004);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR08MB4243;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: 0ab56e01-81a4-44e6-971b-08d788978356
NoDisclaimer: True
X-Forefront-PRVS: 0261CCEEDF
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: lBpz38k2liqU5vVirUWgq+hCjYQsOjj4ppSmDh0kmOf0cVgRfTfVBf26XRyShMRFktIUslUjc26jy4HSfVpD750E/OcMEPLvUOPvZvcrHWEk3QIdlYqGYe5xCeT18KmCOxulxgBjXlT6ksuYKPBtwwqlxKEJEMprQSoXgk06qHneKQG73NV4LfSj5VRSM/oePpCRwDTBBNU5qVPzlgtDdhMrQ3vAyMwyHdGg00YfTnmRhfkttegLfU2pp/AV7BABSXfLYwm4sc/iPHMTf3p6JbvIm1fSe3/LAAcoBPQfz89fdfODUZveBRe46Hl6mIPPfHtCS+bgS1waYQtX6QNdjp21lrgavY0r2kCGpF63hLPa4QoHxU3X3/yEmJjjurzuT4Y9dP0Ydaov3UUeS5+ODDa5jZ+OM/2QiCnfsSzYjq/N4nTy1jF+tsSWccBv+h2D
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2019 17:34:31.5926
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: cc48e0e9-1e21-4a94-9fcc-08d788978908
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: AM0PR08MB4243
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

dw_hdmi: The drm_bridge struct is already embedded, so use
a container_of wrapper to access it.

dw-mipi-dsi: The field is unused, remove it.

Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c     | 15 ++++++++-------
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/br=
idge/synopsys/dw-hdmi.c
index 99274ca0fdf6..946aa1af8841 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -196,6 +196,8 @@ struct dw_hdmi {
 	struct cec_notifier *cec_notifier;
 };
=20
+#define bridge_to_dw_hdmi(b) container_of((b), struct dw_hdmi, bridge)
+
 #define HDMI_IH_PHY_STAT0_RX_SENSE \
 	(HDMI_IH_PHY_STAT0_RX_SENSE0 | HDMI_IH_PHY_STAT0_RX_SENSE1 | \
 	 HDMI_IH_PHY_STAT0_RX_SENSE2 | HDMI_IH_PHY_STAT0_RX_SENSE3)
@@ -2335,7 +2337,7 @@ static const struct drm_connector_helper_funcs dw_hdm=
i_connector_helper_funcs =3D
=20
 static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
 	struct drm_encoder *encoder =3D bridge->encoder;
 	struct drm_connector *connector =3D &hdmi->connector;
 	struct cec_connector_info conn_info;
@@ -2372,7 +2374,7 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *b=
ridge)
=20
 static void dw_hdmi_bridge_detach(struct drm_bridge *bridge)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
=20
 	mutex_lock(&hdmi->cec_notifier_mutex);
 	cec_notifier_conn_unregister(hdmi->cec_notifier);
@@ -2384,7 +2386,7 @@ static enum drm_mode_status
 dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
 			  const struct drm_display_mode *mode)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
 	struct drm_connector *connector =3D &hdmi->connector;
 	enum drm_mode_status mode_status =3D MODE_OK;
=20
@@ -2402,7 +2404,7 @@ static void dw_hdmi_bridge_mode_set(struct drm_bridge=
 *bridge,
 				    const struct drm_display_mode *orig_mode,
 				    const struct drm_display_mode *mode)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
=20
 	mutex_lock(&hdmi->mutex);
=20
@@ -2414,7 +2416,7 @@ static void dw_hdmi_bridge_mode_set(struct drm_bridge=
 *bridge,
=20
 static void dw_hdmi_bridge_disable(struct drm_bridge *bridge)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
=20
 	mutex_lock(&hdmi->mutex);
 	hdmi->disabled =3D true;
@@ -2425,7 +2427,7 @@ static void dw_hdmi_bridge_disable(struct drm_bridge =
*bridge)
=20
 static void dw_hdmi_bridge_enable(struct drm_bridge *bridge)
 {
-	struct dw_hdmi *hdmi =3D bridge->driver_private;
+	struct dw_hdmi *hdmi =3D bridge_to_dw_hdmi(bridge);
=20
 	mutex_lock(&hdmi->mutex);
 	hdmi->disabled =3D false;
@@ -2898,7 +2900,6 @@ __dw_hdmi_probe(struct platform_device *pdev,
 			hdmi->ddc =3D NULL;
 	}
=20
-	hdmi->bridge.driver_private =3D hdmi;
 	hdmi->bridge.funcs =3D &dw_hdmi_bridge_funcs;
 #ifdef CONFIG_OF
 	hdmi->bridge.of_node =3D pdev->dev.of_node;
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/dr=
m/bridge/synopsys/dw-mipi-dsi.c
index b18351b6760a..3aa4f9289416 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
@@ -1064,7 +1064,6 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
 		return ERR_PTR(ret);
 	}
=20
-	dsi->bridge.driver_private =3D dsi;
 	dsi->bridge.funcs =3D &dw_mipi_dsi_bridge_funcs;
 #ifdef CONFIG_OF
 	dsi->bridge.of_node =3D pdev->dev.of_node;
--=20
2.24.0