All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jisheng Zhang <jszhang@marvell.com>
To: ulf.hansson@linaro.org, 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 03/11] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
Date: Tue, 5 Jan 2016 18:51:31 +0800	[thread overview]
Message-ID: <1451991099-4946-4-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1451991099-4946-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-msm
to this allocation.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 drivers/mmc/host/sdhci-msm.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 4695bee..0109446 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -437,17 +437,14 @@ static int sdhci_msm_probe(struct platform_device *pdev)
 	u32 core_version, caps;
 	u8 core_major;
 
-	msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
-	if (!msm_host)
-		return -ENOMEM;
-
-	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
-	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata, 0);
+	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata,
+				sizeof(*msm_host));
 	if (IS_ERR(host))
 		return PTR_ERR(host);
 
 	pltfm_host = sdhci_priv(host);
-	pltfm_host->priv = msm_host;
+	msm_host = sdhci_pltfm_priv(pltfm_host);
+	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
 	msm_host->mmc = host->mmc;
 	msm_host->pdev = pdev;
 
@@ -570,7 +567,7 @@ static int sdhci_msm_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_msm_host *msm_host = pltfm_host->priv;
+	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
 	int dead = (readl_relaxed(host->ioaddr + SDHCI_INT_STATUS) ==
 		    0xffffffff);
 
-- 
2.6.4


WARNING: multiple messages have this Message-ID (diff)
From: Jisheng Zhang <jszhang@marvell.com>
To: <ulf.hansson@linaro.org>, <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 03/11] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
Date: Tue, 5 Jan 2016 18:51:31 +0800	[thread overview]
Message-ID: <1451991099-4946-4-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1451991099-4946-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-msm
to this allocation.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 drivers/mmc/host/sdhci-msm.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 4695bee..0109446 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -437,17 +437,14 @@ static int sdhci_msm_probe(struct platform_device *pdev)
 	u32 core_version, caps;
 	u8 core_major;
 
-	msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
-	if (!msm_host)
-		return -ENOMEM;
-
-	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
-	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata, 0);
+	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata,
+				sizeof(*msm_host));
 	if (IS_ERR(host))
 		return PTR_ERR(host);
 
 	pltfm_host = sdhci_priv(host);
-	pltfm_host->priv = msm_host;
+	msm_host = sdhci_pltfm_priv(pltfm_host);
+	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
 	msm_host->mmc = host->mmc;
 	msm_host->pdev = pdev;
 
@@ -570,7 +567,7 @@ static int sdhci_msm_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_msm_host *msm_host = pltfm_host->priv;
+	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
 	int dead = (readl_relaxed(host->ioaddr + SDHCI_INT_STATUS) ==
 		    0xffffffff);
 
-- 
2.6.4


WARNING: multiple messages have this Message-ID (diff)
From: jszhang@marvell.com (Jisheng Zhang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/11] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
Date: Tue, 5 Jan 2016 18:51:31 +0800	[thread overview]
Message-ID: <1451991099-4946-4-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1451991099-4946-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-msm
to this allocation.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 drivers/mmc/host/sdhci-msm.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 4695bee..0109446 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -437,17 +437,14 @@ static int sdhci_msm_probe(struct platform_device *pdev)
 	u32 core_version, caps;
 	u8 core_major;
 
-	msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
-	if (!msm_host)
-		return -ENOMEM;
-
-	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
-	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata, 0);
+	host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata,
+				sizeof(*msm_host));
 	if (IS_ERR(host))
 		return PTR_ERR(host);
 
 	pltfm_host = sdhci_priv(host);
-	pltfm_host->priv = msm_host;
+	msm_host = sdhci_pltfm_priv(pltfm_host);
+	msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
 	msm_host->mmc = host->mmc;
 	msm_host->pdev = pdev;
 
@@ -570,7 +567,7 @@ static int sdhci_msm_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_msm_host *msm_host = pltfm_host->priv;
+	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
 	int dead = (readl_relaxed(host->ioaddr + SDHCI_INT_STATUS) ==
 		    0xffffffff);
 
-- 
2.6.4

  parent reply	other threads:[~2016-01-05 10:51 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-05 10:51 [PATCH 00/11] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-01-05 10:51 ` Jisheng Zhang
2016-01-05 10:51 ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 01/11] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 02/11] mmc: sdhci-esdhc-imx: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` Jisheng Zhang [this message]
2016-01-05 10:51   ` [PATCH 03/11] mmc: sdhci-msm: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 12:47   ` kbuild test robot
2016-01-05 12:47     ` kbuild test robot
2016-01-05 12:47     ` kbuild test robot
2016-01-06  2:36     ` Jisheng Zhang
2016-01-06  2:36       ` Jisheng Zhang
2016-01-06  2:36       ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 04/11] mmc: sdhci-of-arasan: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 05/11] mmc: sdhci-of-at91: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 06/11] mmc: sdhci-of-esdhc: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 07/11] mmc: sdhci-pxav3: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 08/11] mmc: sdhci-st: " Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51 ` [PATCH 11/11] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
2016-01-05 10:51   ` Jisheng Zhang
     [not found] ` <1451991099-4946-1-git-send-email-jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
2016-01-05 10:51   ` [PATCH 09/11] mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-05 10:51     ` Jisheng Zhang
2016-01-05 10:51     ` Jisheng Zhang
2016-01-05 10:51   ` [PATCH 10/11] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
2016-01-05 10:51     ` Jisheng Zhang
2016-01-05 10:51     ` Jisheng Zhang
2016-01-05 11:45   ` [PATCH 00/11] mmc: use sdhci_pltfm_init for private allocation and clean up Arnd Bergmann
2016-01-05 11:45     ` Arnd Bergmann
2016-01-05 11:45     ` Arnd Bergmann

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=1451991099-4946-4-git-send-email-jszhang@marvell.com \
    --to=jszhang@marvell.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.