Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1302551

[PATCH v3 01/12] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation

Show all headers | View raw

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-bcm2835
to this allocation.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/mmc/host/sdhci-bcm2835.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 1c65d46..4a6a1d1 100644
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -74,7 +74,7 @@ static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg)
 static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
 {
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct bcm2835_sdhci *bcm2835_host = pltfm_host->priv;
+	struct bcm2835_sdhci *bcm2835_host = sdhci_pltfm_priv(pltfm_host);
 	u32 oldval = (reg == SDHCI_COMMAND) ? bcm2835_host->shadow :
 		bcm2835_sdhci_readl(host, reg & ~3);
 	u32 word_num = (reg >> 1) & 1;
@@ -152,20 +152,12 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev)
 	struct sdhci_pltfm_host *pltfm_host;
 	int ret;
 
-	host = sdhci_pltfm_init(pdev, &bcm2835_sdhci_pdata, 0);
+	host = sdhci_pltfm_init(pdev, &bcm2835_sdhci_pdata,
+				sizeof(*bcm2835_host));
 	if (IS_ERR(host))
 		return PTR_ERR(host);
 
-	bcm2835_host = devm_kzalloc(&pdev->dev, sizeof(*bcm2835_host),
-					GFP_KERNEL);
-	if (!bcm2835_host) {
-		dev_err(mmc_dev(host->mmc),
-			"failed to allocate bcm2835_sdhci\n");
-		return -ENOMEM;
-	}
-
 	pltfm_host = sdhci_priv(host);
-	pltfm_host->priv = bcm2835_host;
 
 	pltfm_host->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(pltfm_host->clk)) {
-- 
2.7.0.rc3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/12] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 11:40 +0100
  [PATCH v3 12/12] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 11:40 +0100
  [PATCH v3 11/12] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 11:40 +0100
  [PATCH v3 10/12] mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 11:40 +0100
  [PATCH v3 01/12] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 11:40 +0100
  [PATCH v3 06/12] mmc: sdhci-of-at91: use sdhci_pltfm_init for private allocation Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 12:30 +0100
    Re: [PATCH v3 06/12] mmc: sdhci-of-at91: use sdhci_pltfm_init for  private allocation Ludovic Desroches <ludovic.desroches@atmel.com> - 2016-01-06 14:20 +0100
  [PATCH v3 04/12] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 12:30 +0100
  [PATCH v3 05/12] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 12:30 +0100
  [PATCH v3 03/12] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang <jszhang@marvell.com> - 2016-01-06 12:30 +0100

csiph-web