From: Jisheng Zhang <jszhang@marvell.com>
To: ulf.hansson@linaro.org, adrian.hunter@intel.com, arnd@arndb.de,
ludovic.desroches@atmel.com, swarren@wwwdotorg.org,
lee@kernel.org, eric@anholt.net, michal.simek@xilinx.com,
soren.brinkmann@xilinx.com, srinivas.kandagatla@gmail.com,
maxime.coquelin@st.com, patrice.chotard@st.com,
thierry.reding@gmail.com, sebastian.hesselbarth@gmail.com,
kernel@stlinux.com
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rpi-kernel@lists.infradead.org,
Jisheng Zhang <jszhang@marvell.com>
Subject: [PATCH v5 11/13] mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
Date: Tue, 16 Feb 2016 21:08:29 +0800 [thread overview]
Message-ID: <1455628111-5583-12-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1455628111-5583-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>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-tegra.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 83c4bf7..2c3c57b 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -63,7 +63,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) &&
@@ -99,7 +99,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
@@ -131,7 +131,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, clk_ctrl;
@@ -184,7 +184,7 @@ static void tegra_sdhci_set_bus_width(struct sdhci_host *host, int bus_width)
static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
{
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);
unsigned long host_clk;
if (!clock)
@@ -201,7 +201,7 @@ static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
unsigned timing)
{
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);
if (timing == MMC_TIMING_UHS_DDR50)
tegra_host->ddr_signaling = true;
@@ -380,20 +380,14 @@ 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->ddr_signaling = false;
tegra_host->soc_data = soc_data;
- pltfm_host->priv = tegra_host;
rc = mmc_of_parse(host->mmc);
if (rc)
@@ -429,7 +423,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
next prev parent reply other threads:[~2016-02-16 13:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 13:08 [PATCH v5 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 01/13] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-02-16 18:10 ` Eric Anholt
2016-02-16 13:08 ` [PATCH v5 02/13] mmc: sdhci-esdhc-imx: " Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 03/13] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 04/13] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 05/13] mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove() Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 07/13] mmc: sdhci-of-at91: " Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 08/13] mmc: sdhci-of-esdhc: " Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 09/13] mmc: sdhci-pxav3: " Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 10/13] mmc: sdhci-st: " Jisheng Zhang
2016-02-16 13:08 ` Jisheng Zhang [this message]
2016-02-16 13:08 ` [PATCH v5 12/13] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
2016-02-16 13:08 ` [PATCH v5 13/13] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang
[not found] ` <1455628111-5583-1-git-send-email-jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
2016-02-18 12:40 ` [PATCH v5 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up 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=1455628111-5583-12-git-send-email-jszhang@marvell.com \
--to=jszhang@marvell.com \
--cc=adrian.hunter@intel.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).