aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-01 09:40:15 -0400
committerChris Ball <cjb@laptop.org>2012-07-21 00:02:16 -0400
commit27410ee7e391ce650d6d0242805f080599be7ad7 (patch)
treeca1a99eb74e56504be7d2bf34fecf11271f361b5 /include/linux/mmc
parent7d17baa05da6a2e64ee15011cdf4319bd3e0ff61 (diff)
mmc: core: use a more generic name for slot function types and fields
struct mmc_host::hotplug is becoming a generic hook for slot functions. Rename it accordingly. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/host.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 9deb725799e7..90b6a38b0374 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -150,8 +150,19 @@ struct mmc_async_req {
150 int (*err_check) (struct mmc_card *, struct mmc_async_req *); 150 int (*err_check) (struct mmc_card *, struct mmc_async_req *);
151}; 151};
152 152
153struct mmc_hotplug { 153/**
154 unsigned int irq; 154 * struct mmc_slot - MMC slot functions
155 *
156 * @cd_irq: MMC/SD-card slot hotplug detection IRQ or -EINVAL
157 * @handler_priv: MMC/SD-card slot context
158 *
159 * Some MMC/SD host controllers implement slot-functions like card and
160 * write-protect detection natively. However, a large number of controllers
161 * leave these functions to the CPU. This struct provides a hook to attach
162 * such slot-function drivers.
163 */
164struct mmc_slot {
165 int cd_irq;
155 void *handler_priv; 166 void *handler_priv;
156}; 167};
157 168
@@ -297,7 +308,7 @@ struct mmc_host {
297 308
298 struct delayed_work detect; 309 struct delayed_work detect;
299 int detect_change; /* card detect flag */ 310 int detect_change; /* card detect flag */
300 struct mmc_hotplug hotplug; 311 struct mmc_slot slot;
301 312
302 const struct mmc_bus_ops *bus_ops; /* current bus driver */ 313 const struct mmc_bus_ops *bus_ops; /* current bus driver */
303 unsigned int bus_refs; /* reference counter */ 314 unsigned int bus_refs; /* reference counter */