mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation
Commit 0e74823429
("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>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
8d53e41238
commit
13db83e2b6
1 changed files with 3 additions and 11 deletions
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue