From patchwork Mon Mar 25 07:13:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10868101 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 699191390 for ; Mon, 25 Mar 2019 07:14:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51900291A0 for ; Mon, 25 Mar 2019 07:14:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46435291A7; Mon, 25 Mar 2019 07:14:51 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF713291A0 for ; Mon, 25 Mar 2019 07:14:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9F9F6E65C; Mon, 25 Mar 2019 07:14:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id C10AD6E659 for ; Mon, 25 Mar 2019 07:14:00 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190325071359euoutp011941677ee5b19658d13e0c76e378bbdf~PIjx9E7go0709007090euoutp01o; Mon, 25 Mar 2019 07:13:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190325071359euoutp011941677ee5b19658d13e0c76e378bbdf~PIjx9E7go0709007090euoutp01o Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190325071359eucas1p145688d8f1efbad9adfd2f3ebff4c31d2~PIjxWDz_E2364523645eucas1p1P; Mon, 25 Mar 2019 07:13:59 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 3A.4E.04325.6BF789C5; Mon, 25 Mar 2019 07:13:58 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190325071358eucas1p19d8fa7080e588979618ac4bb4aeccbeb~PIjwl9Iee1607216072eucas1p1q; Mon, 25 Mar 2019 07:13:58 +0000 (GMT) X-AuditID: cbfec7f5-b75ff700000010e5-98-5c987fb63001 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 1D.19.04140.6BF789C5; Mon, 25 Mar 2019 07:13:58 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.51.74]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0POW003QHUR43P00@eusync3.samsung.com>; Mon, 25 Mar 2019 07:13:58 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Subject: [PATCH v3 RESEND 12/24] drm/exynos: remove standalone exynos_drm_crtc leftovers Date: Mon, 25 Mar 2019 08:13:37 +0100 Message-id: <20190325071349.22600-13-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190325071349.22600-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djP87rb6mfEGMw4r2lxa905VouNM9az Wlz5+p7NYtL9CSwW589vYLeYcX4fk8XaI3fZHdg9Nq3qZPO4332cyaNvyypGj8+b5AJYorhs UlJzMstSi/TtErgytm2ax1bwQLJiVv9StgbGq6JdjBwcEgImEi82JnYxcnEICaxglHi6aDlj FyMnkPOZUaKz1RXEBqlZ9G0VC0TRMkaJlrmbmCCc/4wSq3+tZAGpYhPQlPi7+SYbiC0ioCyx al87O0gRs8BvRonpy7exgySEBaIk9hxtYAaxWQRUJaYcmATWwCtgKXH6FkRcQkBeYvWGA2A2 J1D8/+lLzCCDJAR+sko0fVvFBlHkInHl2zkWCFtG4vLkbii7XuL+ihaohg5Gia0bdkJNtZY4 fPwiK4jNLMAnMWnbdGZIAPBKdLQJQZR4SLx+/wfqzx6g/489ZJ7AKLGAkWEVo3hqaXFuemqx cV5quV5xYm5xaV66XnJ+7iZGYHyd/nf86w7GfX+SDjEKcDAq8fC+2Dk9Rog1say4MvcQowQH s5II7xPRGTFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeasZHkQLCaQnlqRmp6YWpBbBZJk4OKUa GIMOPBeYktKaLthxw2XN4c7cA3a8N3Mvmu0t3Hr+w97FptkpE724Fk16LKzxa8PVkHP/5L4f cf+QJC9Q++w8y3Flw6K94ktM7xq+i7Wr2m56MfWhV/ySyo+Kj2KXyyg2OcnqOhbxtR/TE5t0 SEi/qWSRfBuj3NKuHW/SjQXWKim5zvffNptNVYmlOCPRUIu5qDgRAFh6fWWrAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4Vd1t9TNiDCbd4LK4te4cq8XGGetZ La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2 Kak5mWWpRfp2CVwZ2zbNYyt4IFkxq38pWwPjVdEuRk4OCQETiUXfVrF0MXJxCAksYZS42L8a ymlkkti6fz0TSBWbgKbE38032UBsEQFliVX72tlBipgFfjNKfJ7xlRkkISwQJbFxbw87iM0i oCox5cAksAZeAUuJ07camCHWyUus3nAAzOYEiv8/fQnMFhKwkNi7rJF9AiPPAkaGVYwiqaXF uem5xUZ6xYm5xaV56XrJ+bmbGIFBs+3Yzy07GLveBR9iFOBgVOLhddgzPUaINbGsuDL3EKME B7OSCO8T0RkxQrwpiZVVqUX58UWlOanFhxilOViUxHnPG1RGCQmkJ5akZqemFqQWwWSZODil GhgnNJkW1erWL9246GbdLPtjRcwbm7a0KGmHfdrWLKPxUq3MfFndbLaOT17m35S7opUYGpiu /IpY1vhSe9aS05WcVdFh99de5ks/vypFobVXqrGlpz5Z7/6LieeduVgFTuQU3LnIqM2j3y1m 8m2WwOEWr+Z7GnGvYlrXedy8mKFmnFgYyRI6V4mlOCPRUIu5qDgRAOZTA+EWAgAA X-CMS-MailID: 20190325071358eucas1p19d8fa7080e588979618ac4bb4aeccbeb CMS-TYPE: 201P X-CMS-RootMailID: 20190325071358eucas1p19d8fa7080e588979618ac4bb4aeccbeb References: <20190325071349.22600-1-a.hajda@samsung.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1553498039; bh=9zdtxfQqxoDOd9wB0DSn3fjTzZ7lLYD5+W5lsoJ63Kg=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=MahxpZmWz4s1heizEyw2BOwPsYC+QrffNOgeP2AV/bA4kOLUazsaXp9Lx0YIr/zSW xrz1k/ZuAInnx0yJ/6GTS2SZuDYzN4YL1pOrvWn5Mfjh9pg4wYpWOouIg5HYOtMIYA 3xMoTTE+sDu+735JlCVoBjbJNeKjbi+5KtUmrUkA= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , dri-devel@lists.freedesktop.org, Marek Szyprowski MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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; };