From: Jisheng Zhang <jszhang@marvell.com>
To: <ulf.hansson@linaro.org>, <arnd@arndb.de>,
<swarren@wwwdotorg.org>, <lee@kernel.org>, <eric@anholt.net>,
<michal.simek@xilinx.com>, <soren.brinkmann@xilinx.com>,
<ludovic.desroches@atmel.com>, <srinivas.kandagatla@gmail.com>,
<maxime.coquelin@st.com>, <patrice.chotard@st.com>,
<thierry.reding@gmail.com>, <sebastian.hesselbarth@gmail.com>
Cc: <linux-mmc@vger.kernel.org>,
<linux-rpi-kernel@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <kernel@stlinux.com>,
<linux-tegra@vger.kernel.org>,
Jisheng Zhang <jszhang@marvell.com>
Subject: [PATCH v2 10/12] mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
Date: Wed, 6 Jan 2016 11:56:03 +0800 [thread overview]
Message-ID: <1452052565-4232-11-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1452052565-4232-1-git-send-email-jszhang@marvell.com>
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-tegra
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-tegra.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index ad28b49..25d0c08 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -54,7 +54,7 @@ struct sdhci_tegra {
static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
if (unlikely((soc_data->nvquirks & NVQUIRK_FORCE_SDHCI_SPEC_200) &&
@@ -90,7 +90,7 @@ static void tegra_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
/* Seems like we're getting spurious timeout and crc errors, so
@@ -122,7 +122,7 @@ static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
u32 misc_ctrl;
@@ -260,19 +260,13 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
return -EINVAL;
soc_data = match->data;
- host = sdhci_pltfm_init(pdev, soc_data->pdata, 0);
+ host = sdhci_pltfm_init(pdev, soc_data->pdata,
+ sizeof(*tegra_host));
if (IS_ERR(host))
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
-
- tegra_host = devm_kzalloc(&pdev->dev, sizeof(*tegra_host), GFP_KERNEL);
- if (!tegra_host) {
- dev_err(mmc_dev(host->mmc), "failed to allocate tegra_host\n");
- rc = -ENOMEM;
- goto err_alloc_tegra_host;
- }
+ tegra_host = sdhci_pltfm_priv(pltfm_host);
tegra_host->soc_data = soc_data;
- pltfm_host->priv = tegra_host;
rc = mmc_of_parse(host->mmc);
if (rc)
@@ -305,7 +299,6 @@ err_add_host:
err_clk_get:
err_power_req:
err_parse_dt:
-err_alloc_tegra_host:
sdhci_pltfm_free(pdev);
return rc;
}
--
2.7.0.rc3
next prev parent reply other threads:[~2016-01-06 4:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 3:55 [PATCH v2 00/12] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 01/12] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 02/12] mmc: sdhci-esdhc-imx: " Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 03/12] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 04/12] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 05/12] mmc: sdhci-of-arasan: " Jisheng Zhang
2016-01-06 3:55 ` [PATCH v2 06/12] mmc: sdhci-of-at91: " Jisheng Zhang
2016-01-06 9:02 ` Ludovic Desroches
2016-01-06 9:22 ` Jisheng Zhang
2016-01-06 9:34 ` Jisheng Zhang
2016-01-06 10:11 ` Ludovic Desroches
2016-01-06 3:56 ` [PATCH v2 07/12] mmc: sdhci-of-esdhc: " Jisheng Zhang
2016-01-06 3:56 ` [PATCH v2 08/12] mmc: sdhci-pxav3: " Jisheng Zhang
2016-01-06 3:56 ` [PATCH v2 09/12] mmc: sdhci-st: " Jisheng Zhang
2016-01-06 3:56 ` Jisheng Zhang [this message]
2016-01-06 3:56 ` [PATCH v2 11/12] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
2016-01-06 3:56 ` [PATCH v2 12/12] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang
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=1452052565-4232-11-git-send-email-jszhang@marvell.com \
--to=jszhang@marvell.com \
--cc=arnd@arndb.de \
--cc=eric@anholt.net \
--cc=kernel@stlinux.com \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-tegra@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=maxime.coquelin@st.com \
--cc=michal.simek@xilinx.com \
--cc=patrice.chotard@st.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=soren.brinkmann@xilinx.com \
--cc=srinivas.kandagatla@gmail.com \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.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;
as well as URLs for NNTP newsgroup(s).