#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);
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/mfd/tmio.h>
-#include <linux/mmc/cd-gpio.h>
#include <linux/mmc/host.h>
#include <linux/mmc/mmc.h>
+#include <linux/mmc/slot-gpio.h>
#include <linux/mmc/tmio.h>
#include <linux/module.h>
#include <linux/pagemap.h>
tmio_mmc_enable_mmc_irqs(_host, irq_mask);
if (pdata->flags & TMIO_MMC_USE_GPIO_CD) {
- ret = mmc_cd_gpio_request(mmc, pdata->cd_gpio);
+ ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio);
if (ret < 0) {
tmio_mmc_host_remove(_host);
return ret;
* This means we can miss a card-eject, but this is anyway
* possible, because of delayed processing of hotplug events.
*/
- mmc_cd_gpio_free(mmc);
+ mmc_gpio_free_cd(mmc);
if (!host->native_hotplug)
pm_runtime_get_sync(&pdev->dev);