diff options
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/core.h | 5 | ||||
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index a5a3bb286361..1068953943d8 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -111,7 +111,9 @@ struct mmc_request { struct mmc_cmdq_req *cmdq_req; struct request *req; ktime_t io_start; - int lat_hist_enabled; +#ifdef CONFIG_BLOCK + int lat_hist_enabled; +#endif }; struct mmc_bus_ops { @@ -201,6 +203,7 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int); extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort); extern void mmc_release_host(struct mmc_host *host); +extern int mmc_try_claim_host(struct mmc_host *host, unsigned int delay); extern void mmc_get_card(struct mmc_card *card); extern void mmc_put_card(struct mmc_card *card); diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index f67b2ec18e6d..7776afb0ffa5 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -172,7 +172,7 @@ struct dw_mci { /* For edmac */ struct dw_mci_dma_slave *dms; /* Registers's physical base address */ - void *phy_regs; + resource_size_t phy_regs; u32 cmd_status; u32 data_status; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 804d89a825fc..5374bd6c4cbe 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -208,6 +208,7 @@ struct mmc_cmdq_req { unsigned int resp_arg; unsigned int dev_pend_tasks; bool resp_err; + bool skip_err_handling; int tag; /* used for command queuing */ u8 ctx_id; }; |