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: 114738 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp5628605edb; Tue, 3 Oct 2017 23:38:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDXUVYAtRA1acEYpsGJLi2kcFYFIK7EHe8flBc2+gBdcfxIL5YxyB63dqfQE1b9dYjuAEWL X-Received: by 10.84.131.66 with SMTP id 60mr19242735pld.341.1507099125390; Tue, 03 Oct 2017 23:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507099125; cv=none; d=google.com; s=arc-20160816; b=pWdHyzrpZzIj/+deM8/jwGOZ9Lm/Wve4kq3aWYiRZ8vg5uLbWGqGQ0hn6zuN72totN JMC9lieeqMHadxbzVK6dw0liNdjj9vIdPGJmBz6maZZi7S8Vx00DkzpBZw0Vn/b2NMOJ IloKaYtN+5Xof2AZ02d+Jdrh6xOs1e63ADQiJtqMzD7vrXbHNbENnCQQaszb0pQ+M8Rf n2tL8hPlJQtzxJaeV9MJTNqgzE+68xbTR/T8WsaZRheSGamjd9QJRpTHS82vgzC9bHG0 HjMD8r7GqnZAHuoVJX4ig91AWeMj5mJgFE0TGejHPRtAGHt30hnsulcc9MNxmTNsZ0Gd iHWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=cfSskT7nxvo3+92KatpM+YpHfdisuo7V5hhA2qvgduE=; b=rDIeSdmH7ibQ73V8CxdiIq9dw+aiQOn583T+z/17EP6fljXnSIaeAi8jl4HXYvbaLK W0rnpnGUY1tQeYeRvoBVc7vChhbK/2RRMNet9CFw3ONwtaWwctza2HkB2daixAVW6l3T KygIHEgqNd5GHGq77fDdtFnAHbrG/BAOSrF+uw14iyiwZRA94oAOEGDCdeU76g6fsrU0 fCfVw58YNbkv45EdrnZrpwgWjJJx3E0APcmHJs+F5rN43Ub+OI5uYqazN9Pk3MO28BCZ iP/RYAMQ/MGjE6vtXPJVMfcsG5aT/f7sp8nIuaOQIWv1+cbKy/iMnuhtkqTMM+D9aBue 7eCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u13si11686282plm.722.2017.10.03.23.38.44; Tue, 03 Oct 2017 23:38:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-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-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbdJDGim (ORCPT + 6 others); 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?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= 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 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 --- drivers/mmc/host/sdhci-s3c.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) -- 2.14.2 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" 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/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);