From patchwork Fri Mar 1 12:20:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10835079 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 E317517E9 for ; Fri, 1 Mar 2019 12:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2F4A2097A for ; Fri, 1 Mar 2019 12:21:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C73202D964; Fri, 1 Mar 2019 12:21:13 +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 5FEF82097A for ; Fri, 1 Mar 2019 12:21:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388163AbfCAMVN (ORCPT ); Fri, 1 Mar 2019 07:21:13 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:36654 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727782AbfCAMVM (ORCPT ); Fri, 1 Mar 2019 07:21:12 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190301122110euoutp019e2488bdb4ed778ee5dc554aea211ea2~H1RI3Ldvz1400414004euoutp010; Fri, 1 Mar 2019 12:21:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190301122110euoutp019e2488bdb4ed778ee5dc554aea211ea2~H1RI3Ldvz1400414004euoutp010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1551442870; bh=9zdtxfQqxoDOd9wB0DSn3fjTzZ7lLYD5+W5lsoJ63Kg=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=K1MlYw5DJs/pb/M8PsTqEq3QoTDVrNp9MkNJ5sr3rxc4hjH0s/agpt2VcDaWc+ybt eBkkaC/K2oWCAQoQ8G1iP05VEvPyYwE64vrme1AOqWhYXDUZc5svmKIy3E31cokW4g EFEGOMCWm3dOJrmXqpBPqxHqy4LegZstv3tABW98= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190301122110eucas1p1243d41e686a131c680bb778f4c978292~H1RIggXd23187231872eucas1p1c; Fri, 1 Mar 2019 12:21:10 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 73.5E.04441.6B3297C5; Fri, 1 Mar 2019 12:21:10 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a~H1RH2SYwi2871928719eucas1p2Z; Fri, 1 Mar 2019 12:21:09 +0000 (GMT) X-AuditID: cbfec7f2-5e3ff70000001159-5f-5c7923b66083 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 17.23.04284.5B3297C5; Fri, 1 Mar 2019 12:21:09 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PNO007ENSZ56Z20@eusync3.samsung.com>; Fri, 01 Mar 2019 12:21:09 +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 Subject: [PATCH 10/23] drm/exynos: remove standalone exynos_drm_crtc leftovers Date: Fri, 01 Mar 2019 13:20:42 +0100 Message-id: <20190301122055.7135-11-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djP87rblCtjDFY0clvcWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw ZWzbNI+t4IFkxaz+pWwNjFdFuxg5OSQETCTmbzzB2sXIxSEksIJR4tLz40wQzmdGiZ37/jPC VF2d/RgqsYxR4verh8wQzn9GiT0bdzGBVLEJaEr83XyTDcQWEVCWWLWvnR2kiFngEqPE65Pd YKOEBQIkvj05xA5iswioSmzddZUZxOYVsJDYuvgkG8Q6eYnVGw6AxTmB4gdXQgySEPjIKnHk 6Q0miCIXiUtPVrJC2DISnR0HoeL1Ek0zrzBDNHQwSpxYvBxqqrXE4eMXwRqYBfgkJm2bDlTE ARTnlehoE4Io8ZCY+2AFI8Rr3YwS05a/YJvAKLGAkWEVo3hqaXFuemqxYV5quV5xYm5xaV66 XnJ+7iZGYDyd/nf80w7Gr5eSDjEKcDAq8fAmvCyPEWJNLCuuzD3EKMHBrCTCy8dQGSPEm5JY WZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qBkW136aoP69zCj/+a eUbsvOHZE4X6VoJvM/ZJXEiVcrm7KfK24I4Xi2Zwz3cvj/4scrz52Cf3AyJtX4riE6oXzIkT Tp12YK28xrNe86vbLT1PfFsQc+yqprLv4n1mMxREVWPNDwde/Gy7vXSe/vRo3+uFu5a12JV5 ezybn/E7Z++Fqh0bC/Yr1iixFGckGmoxFxUnAgA66JouowIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7pblStjDE790rS4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg yti2aR5bwQPJiln9S9kaGK+KdjFyckgImEhcnf2YqYuRi0NIYAmjxJRXp9ggnEYmiSlLVjKB VLEJaEr83XyTDcQWEVCWWLWvnR2kiFngCqNE+7cudpCEsICfxNbnW1lBbBYBVYmtu64yg9i8 AhYSWxefZINYJy+xesMBsDgnUPzgSpBBHEDbzCU2nY6awMizgJFhFaNIamlxbnpusaFecWJu cWleul5yfu4mRmB4bDv2c/MOxksbgw8xCnAwKvHwJrwsjxFiTSwrrsw9xCjBwawkwsvHUBkj xJuSWFmVWpQfX1Sak1p8iFGag0VJnPe8QWWUkEB6YklqdmpqQWoRTJaJg1OqgXFhtryjSMuh 6Nxn5r9jZS6bT/2+mDv+n2WlRdHm515+Uy8Hx6u0x2hfFDNVKNXy/KB6yXGa3iS+FcdEfX9w 3Hq2Mi9EOsdVe5elz/kpa8LY2eVM1u4wkPu0f8afnNtbC+/c1Z7KFvRU9dqMn8fe6/CUNx78 O8c0zr1Yrurvc2PpAvvLB57PuqXEUpyRaKjFXFScCADJC9lgCwIAAA== X-CMS-MailID: 20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a CMS-TYPE: 201P X-CMS-RootMailID: 20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a References: <20190301122055.7135-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; };