These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / mmc / core.h

diff --git a/kernel/include/linux/mmc/core.h b/kernel/include/linux/mmc/core.h
index de722d4..37967b6 100644 (file)
--- a/kernel/include/linux/mmc/core.h
+++ b/kernel/include/linux/mmc/core.h
@@ -121,6 +121,7 @@ struct mmc_data {
        struct mmc_request      *mrq;           /* associated request */
 
        unsigned int            sg_len;         /* size of scatter list */
+       int                     sg_count;       /* mapped sg entries */
        struct scatterlist      *sg;            /* I/O scatter list */
        s32                     host_cookie;    /* host private data */
 };
@@ -151,10 +152,8 @@ extern int mmc_app_cmd(struct mmc_host *, struct mmc_card *);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
        struct mmc_command *, int);
 extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
-extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool,
-                       bool, bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
-extern int mmc_send_tuning(struct mmc_host *host);
+extern int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);
 extern int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
 
 #define MMC_ERASE_ARG          0x00000000