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 <jh80.chung@xxxxxxxxxxx> Tested-by: Heiko Stuebner <heiko@xxxxxxxxx> --- 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) */ -- 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html