From: Jisheng Zhang <jszhang@marvell.com>
To: ulf.hansson@linaro.org, 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
Cc: kernel@stlinux.com, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Jisheng Zhang <jszhang@marvell.com>
Subject: [PATCH v4 08/13] mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation
Date: Tue, 26 Jan 2016 18:15:48 +0800 [thread overview]
Message-ID: <1453803353-6266-9-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1453803353-6266-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 the
sdhci-of-esdhc driver to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-of-esdhc.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 83b1226..3f34d35 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -49,7 +49,7 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,
int spec_reg, u32 value)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
u32 ret;
/*
@@ -354,7 +354,7 @@ static void esdhc_le_writeb(struct sdhci_host *host, u8 val, int reg)
static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
bool applicable;
dma_addr_t dmastart;
dma_addr_t dmanow;
@@ -404,7 +404,7 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
int pre_div = 1;
int div = 1;
u32 temp;
@@ -569,15 +569,12 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host)
u16 host_ver;
pltfm_host = sdhci_priv(host);
- esdhc = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_esdhc),
- GFP_KERNEL);
+ esdhc = sdhci_pltfm_priv(pltfm_host);
host_ver = sdhci_readw(host, SDHCI_HOST_VERSION);
esdhc->vendor_ver = (host_ver & SDHCI_VENDOR_VER_MASK) >>
SDHCI_VENDOR_VER_SHIFT;
esdhc->spec_ver = host_ver & SDHCI_SPEC_VER_MASK;
-
- pltfm_host->priv = esdhc;
}
static int sdhci_esdhc_probe(struct platform_device *pdev)
@@ -591,9 +588,11 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
np = pdev->dev.of_node;
if (of_get_property(np, "little-endian", NULL))
- host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata,
+ sizeof(struct sdhci_esdhc));
else
- host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata,
+ sizeof(struct sdhci_esdhc));
if (IS_ERR(host))
return PTR_ERR(host);
@@ -603,7 +602,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
sdhci_get_of_property(pdev);
pltfm_host = sdhci_priv(host);
- esdhc = pltfm_host->priv;
+ esdhc = sdhci_pltfm_priv(pltfm_host);
if (esdhc->vendor_ver == VENDOR_V_22)
host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
--
2.7.0
next prev parent reply other threads:[~2016-01-26 10:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 01/13] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 02/13] mmc: sdhci-esdhc-imx: " Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 03/13] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 04/13] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 05/13] mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove() Jisheng Zhang
2016-01-26 18:30 ` Sören Brinkmann
2016-01-26 10:15 ` [PATCH v4 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Jisheng Zhang
[not found] ` <1453803353-6266-1-git-send-email-jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
2016-01-26 10:15 ` [PATCH v4 07/13] mmc: sdhci-of-at91: " Jisheng Zhang
2016-02-04 10:38 ` [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Ulf Hansson
2016-02-08 14:09 ` Adrian Hunter
2016-02-16 2:38 ` Jisheng Zhang
2016-01-26 10:15 ` Jisheng Zhang [this message]
2016-01-26 10:15 ` [PATCH v4 09/13] mmc: sdhci-pxav3: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 10/13] mmc: sdhci-st: " Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 11/13] mmc: sdhci-tegra: " Jisheng Zhang
2016-01-27 15:14 ` Thierry Reding
2016-01-26 10:15 ` [PATCH v4 12/13] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 13/13] 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=1453803353-6266-9-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).