diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/host.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 43bf6a5c398d..efae87b5c4e7 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
| @@ -131,6 +131,8 @@ struct mmc_host { | |||
| 131 | unsigned int max_blk_count; /* maximum number of blocks in one req */ | 131 | unsigned int max_blk_count; /* maximum number of blocks in one req */ |
| 132 | 132 | ||
| 133 | /* private data */ | 133 | /* private data */ |
| 134 | spinlock_t lock; /* lock for claim and bus ops */ | ||
| 135 | |||
| 134 | struct mmc_ios ios; /* current io bus settings */ | 136 | struct mmc_ios ios; /* current io bus settings */ |
| 135 | u32 ocr; /* the current OCR setting */ | 137 | u32 ocr; /* the current OCR setting */ |
| 136 | 138 | ||
| @@ -141,7 +143,6 @@ struct mmc_host { | |||
| 141 | struct mmc_card *card; /* device attached to this host */ | 143 | struct mmc_card *card; /* device attached to this host */ |
| 142 | 144 | ||
| 143 | wait_queue_head_t wq; | 145 | wait_queue_head_t wq; |
| 144 | spinlock_t lock; /* claimed lock */ | ||
| 145 | unsigned int claimed:1; /* host exclusively claimed */ | 146 | unsigned int claimed:1; /* host exclusively claimed */ |
| 146 | 147 | ||
| 147 | struct delayed_work detect; | 148 | struct delayed_work detect; |
| @@ -149,6 +150,10 @@ struct mmc_host { | |||
| 149 | unsigned int removed:1; /* host is being removed */ | 150 | unsigned int removed:1; /* host is being removed */ |
| 150 | #endif | 151 | #endif |
| 151 | 152 | ||
| 153 | const struct mmc_bus_ops *bus_ops; /* current bus driver */ | ||
| 154 | unsigned int bus_refs; /* reference counter */ | ||
| 155 | unsigned int bus_dead:1; /* bus has been released */ | ||
| 156 | |||
| 152 | unsigned long private[0] ____cacheline_aligned; | 157 | unsigned long private[0] ____cacheline_aligned; |
| 153 | }; | 158 | }; |
| 154 | 159 | ||
