From patchwork Wed Oct 4 06:38:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9983899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4668460237 for ; Wed, 4 Oct 2017 06:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A1FA28A7A for ; Wed, 4 Oct 2017 06:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EE9128A87; Wed, 4 Oct 2017 06:38:45 +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=-6.9 required=2.0 tests=BAYES_00,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 B7BA428A7A for ; Wed, 4 Oct 2017 06:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbdJDGim (ORCPT ); Wed, 4 Oct 2017 02:38:42 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:32952 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbdJDGij (ORCPT ); Wed, 4 Oct 2017 02:38:39 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171004063837euoutp015570bc1d19c735477a67454596b23dc0~qSqmYIVp81789817898euoutp01k; Wed, 4 Oct 2017 06:38:37 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171004063836eucas1p1ae902e72242236de513335df7fa97272~qSqlgISYV1946719467eucas1p1X; Wed, 4 Oct 2017 06:38:36 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 6B.74.12867.CE184D95; Wed, 4 Oct 2017 07:38:36 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20171004063835eucas1p1082954a0113f374f11ff364cf4b95408~qSqk1uhNh1946319463eucas1p1Q; Wed, 4 Oct 2017 06:38:35 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-03-59d481ecdccf Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 67.35.18832.BE184D95; Wed, 4 Oct 2017 07:38:35 +0100 (BST) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OXA00MT7D47C980@eusync4.samsung.com>; Wed, 04 Oct 2017 07:38:35 +0100 (BST) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org, linux-mmc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Jaehoon Chung , Ulf Hansson Subject: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs Date: Wed, 04 Oct 2017 08:38:24 +0200 Message-id: <20171004063828.22068-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20171004063828.22068-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsWy7djPc7pvGq9EGhx7KmqxccZ6Vosbv9pY Lc6f38BuceR/P6PFjPP7mCzWHrnLbnH4TTurxfG14Q4cHptWdbJ53Lm2h82jb8sqRo/Pm+QC WKK4bFJSczLLUov07RK4Mg48amMs+MNb8WvnP+YGxmvcXYycHBICJhKT9h9khLDFJC7cW8/W xcjFISSwlFFi7c+LzBDOZ0aJ0y//McF0zL2zgRUisYxRonXSH6iqBiaJjiltzCBVbAKGEl1v u9hAbBEBB4l31y8wgRQxC/QySUyYNh+onYNDWMBV4tInZ5AaFgFVia5zd9lBbF4BW4mtDf/Z ILbJS7xfcB/sPk4BO4m+1s9gmyUEprBJ3J/1gQVkjoSAi0T/aQ6IemGJV8e3sEPYMhKdHQeh ru5nlGhq1YawZzBKnHvLC2FbSxw+fpEVxGYW4JOYtG06M8RIXomONiGIEg+JO1cnQYUdJfZt V4J4dyKjxIIT7YwTGKUXMDKsYhRJLS3OTU8tNtYrTswtLs1L10vOz93ECIzS0/+Of9rB+PWE 1SFGAQ5GJR7ehr7LkUKsiWXFlbmHGCU4mJVEeDtrrkQK8aYkVlalFuXHF5XmpBYfYpTmYFES 57WNaosUEkhPLEnNTk0tSC2CyTJxcEo1MKpxXriWpLX4x1QrOSvra8uvsDfWdaV3yBeLfmpw fHJvxUGxyh2Bx3+zH48QmHq67cRS/4uZHwX1ljwI0nxr9ELsdM5/uX7xmV/YcxcESV/YtElo UlJni+r5l6035b9VvD/GMUdl4mq3B38/rbSVdZhVXyhxes6tM1tmyv55HHfufWd67G+Li81K LMUZiYZazEXFiQCc92MYzgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprELMWRmVeSWpSXmKPExsVy+t/xa7qvG69EGtz9bmKxccZ6Vosbv9pY Lc6f38BuceR/P6PFjPP7mCzWHrnLbnH4TTurxfG14Q4cHptWdbJ53Lm2h82jb8sqRo/Pm+QC WKK4bFJSczLLUov07RK4Mg48amMs+MNb8WvnP+YGxmvcXYycHBICJhJz72xghbDFJC7cW8/W xcjFISSwhFFi1vV3jBBOE5PEw0332UGq2AQMJbredrGB2CICDhLvrl9gAiliFuhnkrh14QmQ w8EhLOAqcemTM0gNi4CqRNe5u2C9vAK2Elsb/rNBbJOXeL/gPiOIzSlgJ9HX+hnsCiGgmmkn GpknMPIuYGRYxSiSWlqcm55bbKhXnJhbXJqXrpecn7uJERhS24793LyD8dLG4EOMAhyMSjy8 DX2XI4VYE8uKK3MPMUpwMCuJ8HbWXIkU4k1JrKxKLcqPLyrNSS0+xCjNwaIkztu7Z3WkkEB6 YklqdmpqQWoRTJaJg1OqgVF0V1GOu1xGwG/vT+3vdS8kz1s3V37j7r3XhOqzyzPu3rrfFLxW 9pGYVu/zwGl7txjq3ry8PXbVpBDX6sCgQoZttzsCj/v6B05be+d+/WfGr5kfVHao9P3q+FDg ETnn9qziuKWZ+/KVds9earniV1ZhXvO/Vw/FjiSfUUo/tPvuUdNH5eHhMq1KLMUZiYZazEXF iQAOBB+SJQIAAA== X-CMS-MailID: 20171004063835eucas1p1082954a0113f374f11ff364cf4b95408 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-CMS-RootMailID: 20171004063835eucas1p1082954a0113f374f11ff364cf4b95408 X-RootMTR: 20171004063835eucas1p1082954a0113f374f11ff364cf4b95408 References: <20171004063828.22068-1-m.szyprowski@samsung.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Support for non-dt based initialization for Exynos SoCs has been removed, so there is no need to keep driver IDs for this case. While touching this, replace odd conditional code for instantiating driver data for Exynos4 SoCs with a simple reference and move that driver data under CONFIG_OF. Signed-off-by: Marek Szyprowski Acked-by: Krzysztof Kozlowski Reviewed-by: Sylwester Nawrocki Reviewed-by: Sylwester Nawrocki --- drivers/mmc/host/sdhci-s3c.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index d328fcf284d1..cda83ccb2702 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = { NULL) }; -#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) -static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = { - .no_divider = true, -}; -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data) -#else -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL) -#endif - static const struct platform_device_id sdhci_s3c_driver_ids[] = { { .name = "s3c-sdhci", .driver_data = (kernel_ulong_t)NULL, - }, { - .name = "exynos4-sdhci", - .driver_data = EXYNOS4_SDHCI_DRV_DATA, }, { } }; MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids); #ifdef CONFIG_OF +static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = { + .no_divider = true, +}; + static const struct of_device_id sdhci_s3c_dt_match[] = { { .compatible = "samsung,s3c6410-sdhci", }, { .compatible = "samsung,exynos4210-sdhci", - .data = (void *)EXYNOS4_SDHCI_DRV_DATA }, + .data = &exynos4_sdhci_drv_data }, {}, }; MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);