From patchwork Mon Dec 14 10:45:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 58339 Delivered-To: patch@linaro.org Received: by 10.112.73.68 with SMTP id j4csp1384063lbv; Mon, 14 Dec 2015 02:46:00 -0800 (PST) X-Received: by 10.98.68.198 with SMTP id m67mr12676932pfi.148.1450089960268; Mon, 14 Dec 2015 02:46:00 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c14si16485855pfj.150.2015.12.14.02.45.59; Mon, 14 Dec 2015 02:46:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932208AbbLNKp7 (ORCPT + 4 others); Mon, 14 Dec 2015 05:45:59 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:13777 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932200AbbLNKp6 (ORCPT ); Mon, 14 Dec 2015 05:45:58 -0500 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZC002V3GKKN780@mailout3.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 14 Dec 2015 10:45:56 +0000 (GMT) X-AuditID: cbfec7f5-f79b16d000005389-16-566e9de483b5 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 75.4B.21385.4ED9E665; Mon, 14 Dec 2015 10:45:56 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NZC00D6QGKGFR40@eusync3.samsung.com>; Mon, 14 Dec 2015 10:45:56 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Inki Dae , Joonyoung Shim , Seung-Woo Kim Subject: [PATCH] drm/exynos: mixer: remove non-devicetree based initialization code Date: Mon, 14 Dec 2015 11:45:41 +0100 Message-id: <1450089941-384-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHJMWRmVeSWpSXmKPExsVy+t/xq7pP5uaFGSzo5rG48vU9m8Wk+xNY LF7cu8hiMeP8PiaLtUfuslvMmPySzYHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg yli2qZe5YKJAxY22P2wNjDN5uxg5OSQETCQ+f1nCDmGLSVy4t56ti5GLQ0hgKaPEg0VnmCCc JiaJrQe+soFUsQkYSnS97QKzRQTcJJoOz2QFKWIWWMYo8f7XFhaQhLBAqETXg/NgNouAqsTK bfcYQWxeoIavMxpZINbJSfx/uYJpAiP3AkaGVYyiqaXJBcVJ6blGesWJucWleel6yfm5mxgh ofB1B+PSY1aHGAU4GJV4eDOW5YYJsSaWFVfmHmKU4GBWEuFNsMoLE+JNSaysSi3Kjy8qzUkt PsQozcGiJM47c9f7ECGB9MSS1OzU1ILUIpgsEwenVANj0uyfjFWZDtJBH4S7Try7xmu7I+nD +4SQ8BD3HNXZJcc+tu2SaKmvXCr9rqe6LfvH3YKKj0ULO1kN/CW3nC2p2bm6woljwW7hzWo9 U88buq3MPv4ntvcNo5j/ivbpWTtaPRJCytYsWBAwo2n60YrZWgGaLgel68/my+RH2S4o1mLN iqrb/lCJpTgj0VCLuag4EQDOiZgEAQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Exynos platform has been fully converted to device tree, so old platform device based init data can be now removed. Signed-off-by: Marek Szyprowski --- drivers/gpu/drm/exynos/exynos_mixer.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 4617b873d91f..ce313486d3bd 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1268,18 +1268,6 @@ static struct mixer_drv_data exynos4210_mxr_drv_data = { .has_sclk = 1, }; -static const struct platform_device_id mixer_driver_types[] = { - { - .name = "s5p-mixer", - .driver_data = (unsigned long)&exynos4210_mxr_drv_data, - }, { - .name = "exynos5-mixer", - .driver_data = (unsigned long)&exynos5250_mxr_drv_data, - }, { - /* end node */ - } -}; - static struct of_device_id mixer_match_types[] = { { .compatible = "samsung,exynos4210-mixer", @@ -1358,23 +1346,20 @@ static int mixer_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct mixer_drv_data *drv; struct mixer_context *ctx; + const struct of_device_id *match; int ret; + if (!dev->of_node) + return -ENODEV; + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) { DRM_ERROR("failed to alloc mixer context.\n"); return -ENOMEM; } - if (dev->of_node) { - const struct of_device_id *match; - - match = of_match_node(mixer_match_types, dev->of_node); - drv = (struct mixer_drv_data *)match->data; - } else { - drv = (struct mixer_drv_data *) - platform_get_device_id(pdev)->driver_data; - } + match = of_match_node(mixer_match_types, dev->of_node); + drv = (struct mixer_drv_data *)match->data; ctx->pdev = pdev; ctx->dev = dev; @@ -1479,5 +1464,4 @@ struct platform_driver mixer_driver = { }, .probe = mixer_probe, .remove = mixer_remove, - .id_table = mixer_driver_types, };