From: Andreas Fenkart <afenkart@gmail.com>
To: linux-mmc@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
pascal.huerst@gmail.com, Andreas Fenkart <afenkart@gmail.com>
Subject: [PATCH v2 7/9] omap_hsmmc: pass mmc_priv struct to gpio init / free
Date: Mon, 29 Sep 2014 11:32:57 +0200 [thread overview]
Message-ID: <1411983179-28677-8-git-send-email-afenkart@gmail.com> (raw)
In-Reply-To: <1411983179-28677-1-git-send-email-afenkart@gmail.com>
this is needed when installing callbacks in the host struct and not
in the platform data, e.g. cover detect irq should be stored in
omap_hsmmc_host and not platform data
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index d05b7f3..f8cd3b3 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -449,7 +449,8 @@ static inline int omap_hsmmc_have_reg(void)
#endif
-static int omap_hsmmc_gpio_init(struct omap_hsmmc_platform_data *pdata)
+static int omap_hsmmc_gpio_init(struct omap_hsmmc_host *host,
+ struct omap_hsmmc_platform_data *pdata)
{
int ret;
@@ -494,7 +495,8 @@ err_free_sp:
return ret;
}
-static void omap_hsmmc_gpio_free(struct omap_hsmmc_platform_data *pdata)
+static void omap_hsmmc_gpio_free(struct omap_hsmmc_host *host,
+ struct omap_hsmmc_platform_data *pdata)
{
if (gpio_is_valid(pdata->gpio_wp))
gpio_free(pdata->gpio_wp);
@@ -2054,14 +2056,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
if (IS_ERR(base))
return PTR_ERR(base);
- ret = omap_hsmmc_gpio_init(pdata);
- if (ret)
- goto err;
-
mmc = mmc_alloc_host(sizeof(struct omap_hsmmc_host), &pdev->dev);
if (!mmc) {
ret = -ENOMEM;
- goto err_alloc;
+ goto err;
}
host = mmc_priv(mmc);
@@ -2078,6 +2076,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
host->next_data.cookie = 1;
host->pbias_enabled = 0;
+ ret = omap_hsmmc_gpio_init(host, pdata);
+ if (ret)
+ goto err_gpio;
+
platform_set_drvdata(pdev, host);
if (pdev->dev.of_node)
@@ -2283,9 +2285,9 @@ err_irq:
if (host->dbclk)
clk_disable_unprepare(host->dbclk);
err1:
+ omap_hsmmc_gpio_free(host, pdata);
+err_gpio:
mmc_free_host(mmc);
-err_alloc:
- omap_hsmmc_gpio_free(pdata);
err:
return ret;
}
@@ -2309,7 +2311,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
if (host->dbclk)
clk_disable_unprepare(host->dbclk);
- omap_hsmmc_gpio_free(host->pdata);
+ omap_hsmmc_gpio_free(host, host->pdata);
mmc_free_host(host->mmc);
return 0;
--
2.1.0
next prev parent reply other threads:[~2014-09-29 9:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 9:32 [PATCH v2 0/9] unshare and simplify omap_hsmmc platform struct Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 1/9] omap_hsmmc: use separate platform data for ompa3 and omap 1/2 driver Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 2/9] omap_hsmmc: remove unused fields in platform_data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 3/9] omap_hsmmc: remove un-initialized callbacks from platform data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 4/9] omap_hsmmc: remove un-ready power_saving field in omap2_hsmmc_info Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 5/9] omap_hsmmc: remove unused get_context_loss_count callback Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 6/9] omap_hsmmc: remove unnecessary omap_hsmmc_slot_data indirection Andreas Fenkart
2014-09-29 9:32 ` Andreas Fenkart [this message]
2014-09-29 9:32 ` [PATCH v2 8/9] omap_hsmmc: Remove unnecessary callbacks from platform data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 9/9] omap_hsmmc: remove unused slot_id parameter Andreas Fenkart
2014-10-02 16:42 ` Felipe Balbi
2014-10-02 16:45 ` Tony Lindgren
2014-10-02 16:51 ` Felipe Balbi
2014-10-02 16:36 ` [PATCH v2 0/9] unshare and simplify omap_hsmmc platform struct Tony Lindgren
2014-10-03 13:00 ` Ulf Hansson
2014-10-06 7:34 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411983179-28677-8-git-send-email-afenkart@gmail.com \
--to=afenkart@gmail.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pascal.huerst@gmail.com \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox