From patchwork Thu Nov 3 06:21: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: 9410389 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 6428360722 for ; Thu, 3 Nov 2016 06:23:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 567032A4D3 for ; Thu, 3 Nov 2016 06:23:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B1D52A516; Thu, 3 Nov 2016 06:23:56 +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 011E82A4DE for ; Thu, 3 Nov 2016 06:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753823AbcKCGXl (ORCPT ); Thu, 3 Nov 2016 02:23:41 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:36272 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754081AbcKCGVv (ORCPT ); Thu, 3 Nov 2016 02:21:51 -0400 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG101XOKYZVP780@mailout1.samsung.com>; Thu, 03 Nov 2016 15:21:48 +0900 (KST) X-AuditID: cbfee61b-f796f6d000004092-dd-581ad77c7b56 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 96.3B.16530.C77DA185; Thu, 3 Nov 2016 15:21:48 +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 <0OG100J7YZ02LAA0@mmp1.samsung.com>; Thu, 03 Nov 2016 15:21:48 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, ulf.hansson@linaro.org, robh+dt@kernel.org, krzk@kernel.org, heiko@sntech.de, shawn.lin@rock-chips.com, Jaehoon Chung Subject: [PATCH 06/13] mmc: core: move the cookie's enum values from sdhci.h to mmc.h Date: Thu, 03 Nov 2016 15:21:28 +0900 Message-id: <20161103062135.10697-7-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.1 In-reply-to: <20161103062135.10697-1-jh80.chung@samsung.com> References: <20161103062135.10697-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xgG7NdakIg5eHLSzmHznHavH/0WtW ixu/2lgtzp/fwG6x6fE1VovLu+awWRz5389o8enBf2aLGef3MVm07j3CbnHnyXpWi+Nrwx14 PDat6mTzuHNtD5vH5iX1Hn9n7Wfx6NuyitFj+7V5zB6fN8kFsEe52WSkJqakFimk5iXnp2Tm pdsqhYa46VooKeQl5qbaKkXo+oYEKSmUJeaUAnlGBmjAwTnAPVhJ3y7BLaNn9wW2glfcFdt6 nrE2MN7k7GLk5JAQMJF4032DGcIWk7hwbz1bFyMXh5DAUkaJ1Z23GCGcH4wSp9/uZAGpYhPQ kdj+7TgTiC0iICvx888FsA5mgYNMEv8n7QYrEhYIl5j87jfYWBYBVYk3u3vAbF4Ba4mpzw6z QqyTl7hw9RRYPaeAjcTEI81gcSGgmluHVzJNYORdwMiwilEitSC5oDgpPdcoL7Vcrzgxt7g0 L10vOT93EyM4Mp5J72A8vMv9EKMAB6MSD++DRKkIIdbEsuLK3EOMEhzMSiK8u64AhXhTEiur Uovy44tKc1KLDzGaAh02kVlKNDkfGLV5JfGGJuYm5sYGFuaWliZGSuK8jbOfhQsJpCeWpGan phakFsH0MXFwSjUwtjn8vnU14dT2LS1nVJurdgpMWrJlqYCOx04eCzX9iCL/LbxPg+78MXw/ YdELvuI5uzgYdjQVMvmZxQcsY/9guj9G7o2ZTYXwjIn/tfkDJX6Jab4+Vn7O+5zql492r6Y/ F3g0Mav5C1P4/wevJI6eOu52KWZ9+QeppVZmhmyc70uiFr46dGBFgxJLcUaioRZzUXEiAKdE DCiiAgAA X-MTR: 20000000000000000@CPGS 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 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 --- 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 2b953eb..d23a675 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -106,6 +106,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) */