summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-04-30 23:31:57 +0200
committerChris Ball <cjb@laptop.org>2012-07-10 23:04:04 -0400
commitfd0ea65d3e675e479e022b6cfc9ebe1864c76afc (patch)
tree8869d7965ccb05b9ca635d21c983d84a552ee21e /drivers/mmc/core
parent0f506a96693d8ad4aeccbd98dbd54a3c7357cfa8 (diff)
downloadop-kernel-dev-fd0ea65d3e675e479e022b6cfc9ebe1864c76afc.zip
op-kernel-dev-fd0ea65d3e675e479e022b6cfc9ebe1864c76afc.tar.gz
mmc: extend and rename cd-gpio helpers to handle more slot GPIO functions
GPIOs can be used in MMC/SD-card slots not only for hotplug detection, but also to implement the write-protection pin. Rename cd-gpio helpers to slot-gpio to make addition of further slot GPIO functions possible. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/Makefile2
-rw-r--r--drivers/mmc/core/slot-gpio.c (renamed from drivers/mmc/core/cd-gpio.c)48
2 files changed, 25 insertions, 25 deletions
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
index dca4428..38ed210 100644
--- a/drivers/mmc/core/Makefile
+++ b/drivers/mmc/core/Makefile
@@ -7,6 +7,6 @@ mmc_core-y := core.o bus.o host.o \
mmc.o mmc_ops.o sd.o sd_ops.o \
sdio.o sdio_ops.o sdio_bus.o \
sdio_cis.o sdio_io.o sdio_irq.o \
- quirks.o cd-gpio.o
+ quirks.o slot-gpio.o
mmc_core-$(CONFIG_DEBUG_FS) += debugfs.o
diff --git a/drivers/mmc/core/cd-gpio.c b/drivers/mmc/core/slot-gpio.c
index 8f5dc08..9796710 100644
--- a/drivers/mmc/core/cd-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -12,72 +12,72 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/jiffies.h>
-#include <linux/mmc/cd-gpio.h>
#include <linux/mmc/host.h>
+#include <linux/mmc/slot-gpio.h>
#include <linux/module.h>
#include <linux/slab.h>
-struct mmc_cd_gpio {
- unsigned int gpio;
- char label[0];
+struct mmc_gpio {
+ unsigned int cd_gpio;
+ char cd_label[0];
};
-static irqreturn_t mmc_cd_gpio_irqt(int irq, void *dev_id)
+static irqreturn_t mmc_gpio_cd_irqt(int irq, void *dev_id)
{
/* Schedule a card detection after a debounce timeout */
mmc_detect_change(dev_id, msecs_to_jiffies(100));
return IRQ_HANDLED;
}
-int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio)
+int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio)
{
size_t len = strlen(dev_name(host->parent)) + 4;
- struct mmc_cd_gpio *cd;
+ struct mmc_gpio *ctx;
int irq = gpio_to_irq(gpio);
int ret;
if (irq < 0)
return irq;
- cd = kmalloc(sizeof(*cd) + len, GFP_KERNEL);
- if (!cd)
+ ctx = kmalloc(sizeof(*ctx) + len, GFP_KERNEL);
+ if (!ctx)
return -ENOMEM;
- snprintf(cd->label, len, "%s cd", dev_name(host->parent));
+ snprintf(ctx->cd_label, len, "%s cd", dev_name(host->parent));
- ret = gpio_request_one(gpio, GPIOF_DIR_IN, cd->label);
+ ret = gpio_request_one(gpio, GPIOF_DIR_IN, ctx->cd_label);
if (ret < 0)
goto egpioreq;
- ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,
- IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
- IRQF_ONESHOT, cd->label, host);
+ ret = request_threaded_irq(irq, NULL, mmc_gpio_cd_irqt,
+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+ ctx->cd_label, host);
if (ret < 0)
goto eirqreq;
- cd->gpio = gpio;
+ ctx->cd_gpio = gpio;
host->hotplug.irq = irq;
- host->hotplug.handler_priv = cd;
+ host->hotplug.handler_priv = ctx;
return 0;
eirqreq:
gpio_free(gpio);
egpioreq:
- kfree(cd);
+ kfree(ctx);
return ret;
}
-EXPORT_SYMBOL(mmc_cd_gpio_request);
+EXPORT_SYMBOL(mmc_gpio_request_cd);
-void mmc_cd_gpio_free(struct mmc_host *host)
+void mmc_gpio_free_cd(struct mmc_host *host)
{
- struct mmc_cd_gpio *cd = host->hotplug.handler_priv;
+ struct mmc_gpio *ctx = host->hotplug.handler_priv;
- if (!cd)
+ if (!ctx)
return;
free_irq(host->hotplug.irq, host);
- gpio_free(cd->gpio);
- kfree(cd);
+ gpio_free(ctx->cd_gpio);
+ kfree(ctx);
}
-EXPORT_SYMBOL(mmc_cd_gpio_free);
+EXPORT_SYMBOL(mmc_gpio_free_cd);
OpenPOWER on IntegriCloud