From patchwork Tue Nov 15 10:12:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 9429285 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 F361E6047D for ; Tue, 15 Nov 2016 10:13:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDF94286F7 for ; Tue, 15 Nov 2016 10:13:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D222B2878E; Tue, 15 Nov 2016 10:13:01 +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 CC1C6286F7 for ; Tue, 15 Nov 2016 10:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755628AbcKOKMv (ORCPT ); Tue, 15 Nov 2016 05:12:51 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:51235 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941610AbcKOKMr (ORCPT ); Tue, 15 Nov 2016 05:12:47 -0500 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGO00AFZHOSER70@mailout1.samsung.com>; Tue, 15 Nov 2016 19:12:35 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-b6-582adf93f4cc Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 16.CF.25310.39FDA285; Tue, 15 Nov 2016 19:12:35 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGO004CZHOYWN60@mmp1.samsung.com>; Tue, 15 Nov 2016 19:12:34 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org, ulf.hansson@linaro.org, heiko@sntech.de, shawn.lin@rock-chips.com, robh+dt@kernel.org, Jaehoon Chung Subject: [PATCHv2 06/10] mmc: core: move the cookie's enum values from sdhci.h to mmc.h Date: Tue, 15 Nov 2016 19:12:28 +0900 Message-id: <20161115101232.3854-7-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.1 In-reply-to: <20161115101232.3854-1-jh80.chung@samsung.com> References: <20161115101232.3854-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRmVeSWpSXmKPExsVy+t9jAd3J97UiDL5u5raYf+Qcq8X/R69Z LW78amO1OPK/n9Gide8Rdos7T9azWhxfG+7A7rFpVSebx51re9g8/s7az+LRt2UVo8f2a/OY PT5vkgtgi3KzyUhNTEktUkjNS85PycxLt1UKDXHTtVBSyEvMTbVVitD1DQlSUihLzCkF8owM 0ICDc4B7sJK+XYJbRuuvqoLpPBU//7E3MDZydTFyckgImEjsm9/ECmGLSVy4t56ti5GLQ0hg KaPEkSeToJwfjBJzPj5gA6liE9CR2P7tOBOILSIgK/HzzwWwOLPAQkaJly8SQWxhgUiJjlfP wOIsAqoSH37eANvAK2Al8e36bEaIbfISF66eYgGxOQWsJY4/OwgWFwKq+fWsh3ECI+8CRoZV jBKpBckFxUnpuYZ5qeV6xYm5xaV56XrJ+bmbGMGB/UxqB+PBXe6HGAU4GJV4eAO9tSKEWBPL iitzDzFKcDArifCaXwMK8aYkVlalFuXHF5XmpBYfYjQFOmwis5Rocj4w6vJK4g1NzE3MjQ0s zC0tTYyUxHkbZz8LFxJITyxJzU5NLUgtgulj4uCUamBkXNOUIty/4/aMvMUSR80aDY9NDGPd kXIx7tufl9rNhZ66N9NuPt32x0510aeV4oyCDCe/TP3I+D5aobviOV/3ggnNJ6wmuu87uMTY 0KbpxJ6q7r6kf3M33Dd+eaVN7k8wr0HBlHdyjWdUn7BJ+bEx/84v2tb2d63Zgol3XmqE/Fe/ 3ii0PLhUiaU4I9FQi7moOBEA3/WCoYICAAA= X-MTR: 20000000000000000@CPGS 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 It's not for only sdhci controller. So it can be moved from sdhci.h to mmc.h. And renamed from sdhci_cookie to mmc_cookie. Signed-off-by: Jaehoon Chung Tested-by: Heiko Stuebner --- drivers/mmc/host/sdhci.h | 6 ------ include/linux/mmc/core.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 766df17..325663b 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -321,12 +321,6 @@ struct sdhci_adma2_64_desc { /* Allow for a a command request and a data request at the same time */ #define SDHCI_MAX_MRQS 2 -enum sdhci_cookie { - COOKIE_UNMAPPED, - COOKIE_PRE_MAPPED, /* mapped by sdhci_pre_req() */ - COOKIE_MAPPED, /* mapped by sdhci_prepare_data() */ -}; - struct sdhci_host { /* Data set by hardware interface driver */ const char *hw_name; /* Hardware bus name */ diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 0ce928b..82d707f 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -118,6 +118,12 @@ struct mmc_command { struct mmc_request *mrq; /* associated request */ }; +enum mmc_cookie { + COOKIE_UNMAPPED, + COOKIE_PRE_MAPPED, /* mapped by pre_req() of controller */ + COOKIE_MAPPED, /* mapped by prepare_data() of controller */ +}; + struct mmc_data { unsigned int timeout_ns; /* data timeout (in ns, max 80ms) */ unsigned int timeout_clks; /* data timeout (in clocks) */