mmc: core: convert slot functions to managed allocation
This prepares for the addition of further slot functions.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 92cba02..41689da 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -29,6 +29,34 @@
return IRQ_HANDLED;
}
+static int mmc_gpio_alloc(struct mmc_host *host)
+{
+ size_t len = strlen(dev_name(host->parent)) + 4;
+ struct mmc_gpio *ctx;
+
+ mutex_lock(&host->slot.lock);
+
+ ctx = host->slot.handler_priv;
+ if (!ctx) {
+ /*
+ * devm_kzalloc() can be called after device_initialize(), even
+ * before device_add(), i.e., between mmc_alloc_host() and
+ * mmc_add_host()
+ */
+ ctx = devm_kzalloc(&host->class_dev, sizeof(*ctx) + len,
+ GFP_KERNEL);
+ if (ctx) {
+ snprintf(ctx->cd_label, len, "%s cd", dev_name(host->parent));
+ ctx->cd_gpio = -EINVAL;
+ host->slot.handler_priv = ctx;
+ }
+ }
+
+ mutex_unlock(&host->slot.lock);
+
+ return ctx ? 0 : -ENOMEM;
+}
+
int mmc_gpio_get_cd(struct mmc_host *host)
{
struct mmc_gpio *ctx = host->slot.handler_priv;
@@ -43,20 +71,24 @@
int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio)
{
- size_t len = strlen(dev_name(host->parent)) + 4;
struct mmc_gpio *ctx;
int irq = gpio_to_irq(gpio);
int ret;
- ctx = kmalloc(sizeof(*ctx) + len, GFP_KERNEL);
- if (!ctx)
- return -ENOMEM;
+ ret = mmc_gpio_alloc(host);
+ if (ret < 0)
+ return ret;
- snprintf(ctx->cd_label, len, "%s cd", dev_name(host->parent));
+ ctx = host->slot.handler_priv;
ret = gpio_request_one(gpio, GPIOF_DIR_IN, ctx->cd_label);
if (ret < 0)
- goto egpioreq;
+ /*
+ * don't bother freeing memory. It might still get used by other
+ * slot functions, in any case it will be freed, when the device
+ * is destroyed.
+ */
+ return ret;
/*
* Even if gpio_to_irq() returns a valid IRQ number, the platform might
@@ -80,13 +112,8 @@
host->caps |= MMC_CAP_NEEDS_POLL;
ctx->cd_gpio = gpio;
- host->slot.handler_priv = ctx;
return 0;
-
-egpioreq:
- kfree(ctx);
- return ret;
}
EXPORT_SYMBOL(mmc_gpio_request_cd);
@@ -107,7 +134,5 @@
ctx->cd_gpio = -EINVAL;
gpio_free(gpio);
- host->slot.handler_priv = NULL;
- kfree(ctx);
}
EXPORT_SYMBOL(mmc_gpio_free_cd);