From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DD98C35679 for ; Mon, 24 Feb 2020 09:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 346A52086A for ; Mon, 24 Feb 2020 09:10:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="jgYzdUzd"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="DcbMLhiC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728240AbgBXJKa (ORCPT ); Mon, 24 Feb 2020 04:10:30 -0500 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:36785 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726673AbgBXJK1 (ORCPT ); Mon, 24 Feb 2020 04:10:27 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 7871260C; Mon, 24 Feb 2020 04:10:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 24 Feb 2020 04:10:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=xdEmxI5f8XbEy pSv28nRJoKuW6VrPNbVXtzW3i8T0t4=; b=jgYzdUzdeiYMgcppca/xTPSXnLj0Y uYONTG/K6idY2MXAcOL9RI4bI3ENhbdsUtgD+qt3BgQ4AUJwRcX1I2RvKinx66K3 jg+O79cCFJdZIe3IfCg+sf0O/1JY9fnnc2aKM8ChgYyuZ/shNhglYEkLZ8Y3TK89 1IMoHNOC0M4WzL6tINwJwiQRCkXQpA+CACbVEa7uu8YsrDb2hJK59THRMqFIdOdh G6OgkMP4LCG3kWNo0pXNkZbuwcZlbFq6eFOTrzaOEjN/MDSAOUxH48Sv9yF5pW7t IUAyjxeunq7kqJG34BQuKXCPaZuQPWYoW6LGcCCUvtW1Kpl+4AuyWuSjQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=xdEmxI5f8XbEypSv28nRJoKuW6VrPNbVXtzW3i8T0t4=; b=DcbMLhiC jnrJ5hGNMgEbdWMXYfuNRVl7dbJUM1K5FndqKjj9rb8SWdKvO7VjTTxkxPdWvU/t rkMgfgdbFs0DMEkdpqSlLVvicGWz7Evki72J7FGkWQTiI67NZucketQYgztm4kBO KCtfBjNulLjKCBYajEVCa+zs0hOSMAJ1O+6Vs0CbmxhMd0LnNChWTBFJ7rqC1b7c EKuCGK9Z9KRMdIwiQrJdl6ucaWliJAM/z7NyZQgsn8wcv4Kn3iuDrs/+WF830Hf4 4RRYDwRBvx6R79C/aryhFSdYNd7mn9uSVOlsz0JmWhRVQjVr8evu5e4UEVzeRjdz BqTMGqA0xmNleA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrledtucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurh ephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhmvgcutfhi phgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecukfhppeeltddrkeelrd eikedrjeeinecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehmrghilhhfrhho mhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id BB8ED3060D1A; Mon, 24 Feb 2020 04:10:25 -0500 (EST) From: Maxime Ripard To: Nicolas Saenz Julienne , Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dave Stevenson , Tim Gover , Phil Elwell , Maxime Ripard Subject: [PATCH 67/89] drm/vc4: hdmi: Use local vc4_hdmi directly Date: Mon, 24 Feb 2020 10:07:09 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function vc4_hdmi_connector_detect access its vc4_hdmi struct by dereferencing the pointer in the structure vc4_dev. This will cause some issues when we will have multiple HDMI controllers, so let's just use the local variable for now instead of dereferencing that pointer all the time, and we'll fix the local variable later. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index ec3062c4469f..8b563bdd451d 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -124,20 +124,20 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_hdmi *vc4_hdmi = vc4->hdmi; - if (vc4->hdmi->hpd_gpio) { - if (gpio_get_value_cansleep(vc4->hdmi->hpd_gpio) ^ - vc4->hdmi->hpd_active_low) + if (vc4_hdmi->hpd_gpio) { + if (gpio_get_value_cansleep(vc4_hdmi->hpd_gpio) ^ + vc4_hdmi->hpd_active_low) return connector_status_connected; - cec_phys_addr_invalidate(vc4->hdmi->cec_adap); + cec_phys_addr_invalidate(vc4_hdmi->cec_adap); return connector_status_disconnected; } - if (drm_probe_ddc(vc4->hdmi->ddc)) + if (drm_probe_ddc(vc4_hdmi->ddc)) return connector_status_connected; if (HDMI_READ(VC4_HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) return connector_status_connected; - cec_phys_addr_invalidate(vc4->hdmi->cec_adap); + cec_phys_addr_invalidate(vc4_hdmi->cec_adap); return connector_status_disconnected; } -- git-series 0.9.1