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 5593BC3567B for ; Mon, 24 Feb 2020 09:12:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B90C20828 for ; Mon, 24 Feb 2020 09:12:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="Qwp3WREa"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="F6a6wT3i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728214AbgBXJKZ (ORCPT ); Mon, 24 Feb 2020 04:10:25 -0500 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:40061 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728204AbgBXJKX (ORCPT ); Mon, 24 Feb 2020 04:10:23 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 1A25D64F; Mon, 24 Feb 2020 04:10:22 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 24 Feb 2020 04:10:22 -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=6JOaOIBdtoUeg Tom2QhdvjNsliMPVjzGF5uofD2u6GM=; b=Qwp3WREauSmn3syjd2bLg6Kp0KLJl 1S8qZDMGmTJrRCy6UKsxLGDY8s1iGZ1II+dE28sJG+BqbDxWLoimibqBh19FatYv 8l9OxZFlIFdVYFwP5l+3fSZJa9R2MuQ/3sQKWpFJD5/1zEPD+ELuORvLli/9DpOv 1TAd97CJ/q8jy1vg29suZFskvGUe0vGAMGuebYuWL1rCRa979x8XHyRkhvxXHGoS HvCO4uu28rbIWhyj0vRXWOgikuhgfxddBTsw0u9vWJmTuetgDM92AOlRSrKIU06K UDOtTCFWtiXO11wyOHVEf3hVC6+fBg2Cj0QJjYw8p/Pqcxu4XCpceW7Bw== 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=6JOaOIBdtoUegTom2QhdvjNsliMPVjzGF5uofD2u6GM=; b=F6a6wT3i hdeG4O8c+tU2PiY9n7KTlspa1912oveMwFLIsgAJ2l+yZK3gyWOru0pP6A/IJq9o FVWzyJ1e7xv4vlnRltEJmlLg2x85QhW8cE+iBQMM+tJTzRIZXHBp1kZC3lcl3QXV lhWe9ybOlOrYHuKCW+AQIZHs+U606AVgI3e1dMhKXv1tC7bGWBCelXv+S5/JxmTJ jD3kH9nmpwfeoxyoQgoOLasxKHGzeOP6DTFEC7X9mx9d4RJ9Cdp3SxRCi0RT7Qq2 Rtb02moXEZTmsCnMea5dSFr+1vj5GnTswO6oS8J53wL8esTK1cLBeQV8/Dyibqp8 7px6LaAXTyQUKw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrledtucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurh ephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhmvgcutfhi phgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecukfhppeeltddrkeelrd eikedrjeeinecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehmrghilhhfrhho 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 55D16328005D; Mon, 24 Feb 2020 04:10:21 -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 64/89] drm/vc4: hdmi: Remove DDC argument to connector_init Date: Mon, 24 Feb 2020 10:07:06 +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 Now that we are passing the vc4_hdmi structure to the connector init function, we can simply use the pointer in that structure instead of having the pointer as an argument. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 5db003bb3cf5..4964ec6f5608 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -191,8 +191,7 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = }; static int vc4_hdmi_connector_init(struct drm_device *dev, - struct vc4_hdmi *vc4_hdmi, - struct i2c_adapter *ddc) + struct vc4_hdmi *vc4_hdmi) { struct vc4_hdmi_connector *hdmi_connector = &vc4_hdmi->connector; struct drm_connector *connector = &hdmi_connector->base; @@ -204,7 +203,7 @@ static int vc4_hdmi_connector_init(struct drm_device *dev, drm_connector_init_with_ddc(dev, connector, &vc4_hdmi_connector_funcs, DRM_MODE_CONNECTOR_HDMIA, - ddc); + vc4_hdmi->ddc); drm_connector_helper_add(connector, &vc4_hdmi_connector_helper_funcs); /* Create and attach TV margin props to this connector. */ @@ -1317,7 +1316,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) DRM_MODE_ENCODER_TMDS, NULL); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); - ret = vc4_hdmi_connector_init(drm, vc4_hdmi, vc4_hdmi->ddc); + ret = vc4_hdmi_connector_init(drm, vc4_hdmi); if (ret) goto err_destroy_encoder; -- git-series 0.9.1