summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-01 15:40:15 +0200
committerChris Ball <cjb@laptop.org>2012-07-21 00:02:16 -0400
commit27410ee7e391ce650d6d0242805f080599be7ad7 (patch)
treeca1a99eb74e56504be7d2bf34fecf11271f361b5 /include/linux
parent7d17baa05da6a2e64ee15011cdf4319bd3e0ff61 (diff)
downloadtalos-op-linux-27410ee7e391ce650d6d0242805f080599be7ad7.tar.gz
talos-op-linux-27410ee7e391ce650d6d0242805f080599be7ad7.zip
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')
-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 {
int (*err_check) (struct mmc_card *, struct mmc_async_req *);
};
-struct mmc_hotplug {
- unsigned int irq;
+/**
+ * struct mmc_slot - MMC slot functions
+ *
+ * @cd_irq: MMC/SD-card slot hotplug detection IRQ or -EINVAL
+ * @handler_priv: MMC/SD-card slot context
+ *
+ * Some MMC/SD host controllers implement slot-functions like card and
+ * write-protect detection natively. However, a large number of controllers
+ * leave these functions to the CPU. This struct provides a hook to attach
+ * such slot-function drivers.
+ */
+struct mmc_slot {
+ int cd_irq;
void *handler_priv;
};
@@ -297,7 +308,7 @@ struct mmc_host {
struct delayed_work detect;
int detect_change; /* card detect flag */
- struct mmc_hotplug hotplug;
+ struct mmc_slot slot;
const struct mmc_bus_ops *bus_ops; /* current bus driver */
unsigned int bus_refs; /* reference counter */
OpenPOWER on IntegriCloud