mmc: core: Move erase/trim/discard defines from public core.h to mmc.h

As the public mmc.h header already contains similar defines for other mmc
commands and arguments, let's move those for erase/trim/discard into here
as well.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index faacc90f87111799c90de424b578af9896f2adf4..6440e10c86cdaaa9dd266edf81a27e966c112e64 100644 (file)
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -164,16 +164,6 @@ extern struct mmc_async_req *mmc_start_req(struct mmc_host *,
 extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
 extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
 
-#define MMC_ERASE_ARG          0x00000000
-#define MMC_SECURE_ERASE_ARG   0x80000000
-#define MMC_TRIM_ARG           0x00000001
-#define MMC_DISCARD_ARG                0x00000003
-#define MMC_SECURE_TRIM1_ARG   0x80000001
-#define MMC_SECURE_TRIM2_ARG   0x80008000
-
-#define MMC_SECURE_ARGS                0x80000000
-#define MMC_TRIM_ARGS          0x00008001
-
 extern int mmc_hw_reset(struct mmc_host *host);
 extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
 

diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 261772e3effea79b620e1cfa4e2a97b8b1cf5bb0..8f7854324d2b5b6b0d5003262c4ca2605fbf7ce6 100644 (file)
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -462,12 +462,23 @@ struct _mmc_csd {
 /*
  * MMC_SWITCH access modes
  */
-
 #define MMC_SWITCH_MODE_CMD_SET                0x00    /* Change the command set */
 #define MMC_SWITCH_MODE_SET_BITS       0x01    /* Set bits which are 1 in value */
 #define MMC_SWITCH_MODE_CLEAR_BITS     0x02    /* Clear bits which are 1 in value */
 #define MMC_SWITCH_MODE_WRITE_BYTE     0x03    /* Set target to value */
 
+/*
+ * Erase/trim/discard
+ */
+#define MMC_ERASE_ARG                  0x00000000
+#define MMC_SECURE_ERASE_ARG           0x80000000
+#define MMC_TRIM_ARG                   0x00000001
+#define MMC_DISCARD_ARG                        0x00000003
+#define MMC_SECURE_TRIM1_ARG           0x80000001
+#define MMC_SECURE_TRIM2_ARG           0x80008000
+#define MMC_SECURE_ARGS                        0x80000000
+#define MMC_TRIM_ARGS                  0x00008001
+
 #define mmc_driver_type_mask(n)                (1 << (n))
 
 #endif /* LINUX_MMC_MMC_H */