From patchwork Wed Mar 20 13:06:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10861573 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D360A18EC for ; Wed, 20 Mar 2019 13:07:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC5C028B92 for ; Wed, 20 Mar 2019 13:07:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAC4928B63; Wed, 20 Mar 2019 13:07:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4248129BEF for ; Wed, 20 Mar 2019 13:07:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727471AbfCTNHT (ORCPT ); Wed, 20 Mar 2019 09:07:19 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:58210 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727415AbfCTNHS (ORCPT ); Wed, 20 Mar 2019 09:07:18 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190320130717euoutp02e5747295fd162ae597c69615f523e6c2~NrJ0QODvS1534915349euoutp02B; Wed, 20 Mar 2019 13:07:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190320130717euoutp02e5747295fd162ae597c69615f523e6c2~NrJ0QODvS1534915349euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1553087237; bh=9zdtxfQqxoDOd9wB0DSn3fjTzZ7lLYD5+W5lsoJ63Kg=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=DhSbSHhQTr2rlVDTJCVb73A2+qbpq7aiJPtlV641Ied558KotVL2kmUvpQLKlz8Is W9u568lr9rvP5EYrOFTqk5+/iKGTHWn10dfa3A22knMUrD/Gvu3U8eQ1xjzAJiIUqN jH9AgLwKTssC4HDWwdoByCi36g/tTtgqU54cO0Xo= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190320130716eucas1p2d7e12124aa59c76f3e9cd67f38bf505b~NrJzzGOrl1666516665eucas1p2M; Wed, 20 Mar 2019 13:07:16 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 8B.35.04441.40B329C5; Wed, 20 Mar 2019 13:07:16 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf~NrJzOd3Qw2442724427eucas1p12; Wed, 20 Mar 2019 13:07:15 +0000 (GMT) X-AuditID: cbfec7f2-5e3ff70000001159-aa-5c923b047bb1 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 19.DA.04128.30B329C5; Wed, 20 Mar 2019 13:07:15 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0POO004P71RZN460@eusync1.samsung.com>; Wed, 20 Mar 2019 13:07:15 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v2 RESEND 10/24] drm/exynos: remove standalone exynos_drm_crtc leftovers Date: Wed, 20 Mar 2019 14:06:53 +0100 Message-id: <20190320130707.25161-11-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djPc7os1pNiDFo/i1vcWneO1WLjjPWs Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b lNSczLLUIn27BK6MbZvmsRU8kKyY1b+UrYHxqmgXIyeHhICJxNGee0xdjFwcQgIrGCV+dX1g g3A+M0rcnzSHFa5q5TQ2EFtIYBmjxLMzGhBF/xklZvzoAEuwCWhK/N18E8wWEVCWWLWvnR2k iFngN6PE9OXb2EESwgJREtsbHoLZLAKqEv0/7zF2MXJw8ApYSmxZmA6xTF5i9YYDzCA2J1D4 4Zz/YHMkBBrZJDb1TWSCKHKROPZ0FTuELSNxeXI3C4RdL3F/RQszREMHo8TWDTuZIRLWEoeP XwR7h1mAT2LStunMIIslBHglOtqEIEo8JC6+O8oK8VkP0GdPFjJPYJRYwMiwilE8tbQ4Nz21 2DAvtVyvODG3uDQvXS85P3cTIzC+Tv87/mkH49dLSYcYBTgYlXh4G95MiBFiTSwrrsw9xCjB wawkwhuhNClGiDclsbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dU A2OMZDznfOG0/+I+Zy2uyni65fkL+W+5sTPgsx/7ggghx/387xf5sPGwPuFpVv6sH3eebXPy lxsrSkN82EOfXhH3UOV+FN4XwcYsElB6+6n68d0LigRylp5ZupOdN31hgNH+5QJ7ti67xfVi 98yJKj9Keb7OmKX5KHK3VoKra96dA9mMgradwUosxRmJhlrMRcWJAOg0x0mrAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV1m60kxBvdPWlvcWneO1WLjjPWs Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b lNSczLLUIn27BK6MbZvmsRU8kKyY1b+UrYHxqmgXIyeHhICJxNGV09i6GLk4hASWMEqsWNbJ BpIQEmhkkpixvBjEZhPQlPi7+SZYXERAWWLVvnZ2kAZmgd+MEp9nfGUGSQgLREk8PgGS4ORg EVCV6P95j7GLkYODV8BSYsvCdIhl8hKrNxwAK+cECj+c858dYpeFxOITdxknMPIsYGRYxSiS Wlqcm55bbKRXnJhbXJqXrpecn7uJERgw24793LKDsetd8CFGAQ5GJR7eiqcTYoRYE8uKK3MP MUpwMCuJ8EYoTYoR4k1JrKxKLcqPLyrNSS0+xCjNwaIkznveoDJKSCA9sSQ1OzW1ILUIJsvE wSnVwHhgqcBc26961jbneQM+TZrjLVOyl3O69oUzz1jCzA+7LQ6+GLGh6ZxuatWvnurLVk+n G+++k7Quu+ie/D7T/hWfYtKf7n12KWdPZWVqaKZZZ8vCh6vPqrbMuv+q2O9EdBbzpYcXJH1X CFxTj7a99ISD3zdP/f+mTZqxcXuTV4U8mJ1WlawsJ6jEUpyRaKjFXFScCADcn3nrFAIAAA== X-CMS-MailID: 20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf CMS-TYPE: 201P X-CMS-RootMailID: 20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf References: <20190320130707.25161-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since exynos_drm_crtc is always embedded exynos_drm_crtc_create helper and ctx field can be removed. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 35 ------------------------ drivers/gpu/drm/exynos/exynos_drm_crtc.h | 5 ---- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -- 3 files changed, 42 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 4ff1e0ff2255..72e224e80565 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -182,41 +182,6 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc, &exynos_crtc_funcs, NULL); } -struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, - struct drm_plane *plane, - enum exynos_drm_output_type type, - const struct exynos_drm_crtc_ops *ops, - void *ctx) -{ - struct exynos_drm_crtc *exynos_crtc; - struct drm_crtc *crtc; - int ret; - - exynos_crtc = kzalloc(sizeof(*exynos_crtc), GFP_KERNEL); - if (!exynos_crtc) - return ERR_PTR(-ENOMEM); - - exynos_crtc->type = type; - exynos_crtc->ops = ops; - exynos_crtc->ctx = ctx; - - crtc = &exynos_crtc->base; - - ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL, - &exynos_crtc_funcs, NULL); - if (ret < 0) - goto err_crtc; - - drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs); - - return exynos_crtc; - -err_crtc: - plane->funcs->destroy(plane); - kfree(exynos_crtc); - return ERR_PTR(ret); -} - struct exynos_drm_crtc *exynos_drm_crtc_get_by_type(struct drm_device *drm_dev, enum exynos_drm_output_type out_type) { diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h index 9e35a9e02332..7b0c964521fa 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h @@ -20,11 +20,6 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc, struct drm_device *drm_dev); -struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, - struct drm_plane *plane, - enum exynos_drm_output_type out_type, - const struct exynos_drm_crtc_ops *ops, - void *context); void exynos_drm_crtc_wait_pending_update(struct exynos_drm_crtc *exynos_crtc); void exynos_drm_crtc_finish_update(struct exynos_drm_crtc *exynos_crtc, struct exynos_drm_plane *exynos_plane); diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 1d4ef0245958..82af112be03d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -147,14 +147,12 @@ struct exynos_drm_clk { * @base: crtc object. * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI. * @ops: pointer to callbacks for exynos drm specific functionality - * @ctx: A pointer to the crtc's implementation specific context * @pipe_clk: A pointer to the crtc's pipeline clock. */ struct exynos_drm_crtc { struct drm_crtc base; enum exynos_drm_output_type type; const struct exynos_drm_crtc_ops *ops; - void *ctx; struct exynos_drm_clk *pipe_clk; bool i80_mode : 1; };