diff options
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/host.h | 5 | ||||
-rw-r--r-- | include/linux/mmc/slot-gpio.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index e7743eca1021..85146235231e 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -324,6 +324,7 @@ struct mmc_host { | |||
324 | #define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */ | 324 | #define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */ |
325 | #define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */ | 325 | #define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */ |
326 | #define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */ | 326 | #define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */ |
327 | #define MMC_CAP_DONE_COMPLETE (1 << 27) /* RW reqs can be completed within mmc_request_done() */ | ||
327 | #define MMC_CAP_CD_WAKE (1 << 28) /* Enable card detect wake */ | 328 | #define MMC_CAP_CD_WAKE (1 << 28) /* Enable card detect wake */ |
328 | #define MMC_CAP_CMD_DURING_TFR (1 << 29) /* Commands during data transfer */ | 329 | #define MMC_CAP_CMD_DURING_TFR (1 << 29) /* Commands during data transfer */ |
329 | #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ | 330 | #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ |
@@ -380,6 +381,7 @@ struct mmc_host { | |||
380 | unsigned int doing_retune:1; /* re-tuning in progress */ | 381 | unsigned int doing_retune:1; /* re-tuning in progress */ |
381 | unsigned int retune_now:1; /* do re-tuning at next req */ | 382 | unsigned int retune_now:1; /* do re-tuning at next req */ |
382 | unsigned int retune_paused:1; /* re-tuning is temporarily disabled */ | 383 | unsigned int retune_paused:1; /* re-tuning is temporarily disabled */ |
384 | unsigned int use_blk_mq:1; /* use blk-mq */ | ||
383 | 385 | ||
384 | int rescan_disable; /* disable card detection */ | 386 | int rescan_disable; /* disable card detection */ |
385 | int rescan_entered; /* used with nonremovable devices */ | 387 | int rescan_entered; /* used with nonremovable devices */ |
@@ -422,9 +424,6 @@ struct mmc_host { | |||
422 | 424 | ||
423 | struct dentry *debugfs_root; | 425 | struct dentry *debugfs_root; |
424 | 426 | ||
425 | struct mmc_async_req *areq; /* active async req */ | ||
426 | struct mmc_context_info context_info; /* async synchronization info */ | ||
427 | |||
428 | /* Ongoing data transfer that allows commands during transfer */ | 427 | /* Ongoing data transfer that allows commands during transfer */ |
429 | struct mmc_request *ongoing_mrq; | 428 | struct mmc_request *ongoing_mrq; |
430 | 429 | ||
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h index 82f0d289f110..91f1ba0663c8 100644 --- a/include/linux/mmc/slot-gpio.h +++ b/include/linux/mmc/slot-gpio.h | |||
@@ -33,5 +33,6 @@ void mmc_gpio_set_cd_isr(struct mmc_host *host, | |||
33 | irqreturn_t (*isr)(int irq, void *dev_id)); | 33 | irqreturn_t (*isr)(int irq, void *dev_id)); |
34 | void mmc_gpiod_request_cd_irq(struct mmc_host *host); | 34 | void mmc_gpiod_request_cd_irq(struct mmc_host *host); |
35 | bool mmc_can_gpio_cd(struct mmc_host *host); | 35 | bool mmc_can_gpio_cd(struct mmc_host *host); |
36 | bool mmc_can_gpio_ro(struct mmc_host *host); | ||
36 | 37 | ||
37 | #endif | 38 | #endif |