Commit 0e748234 authored by Christian Daudt's avatar Christian Daudt Committed by Chris Ball
Browse files

mmc: sdhci: Add size for caller in init+register 



Add a param to allow users of sdhci_pltfm to allocate private space
in calls to sdhci_pltfm_init+sdhci_pltfm_register. This is implemented
in the same way as sdhci does for its users.
 None of the users have been migrated yet and are passing in zero to
retain their private allocation.

- todo: migrate clients to using allocation this way
- todo: remove priv variable once migration is complete

Also removed unused variable in sdhci_pltfm_init fn

Signed-off-by: default avatarChristian Daudt <csd@broadcom.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 7396e318

drivers/mmc/host/sdhci-bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 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);

	host = sdhci_pltfm_init(pdev, &bcm2835_sdhci_pdata, 0);

	if (IS_ERR(host))

		return PTR_ERR(host);

drivers/mmc/host/sdhci-cns3xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { 


static int sdhci_cns3xxx_probe(struct platform_device *pdev)

{

	return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata);

	return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);

}



static int sdhci_cns3xxx_remove(struct platform_device *pdev)

drivers/mmc/host/sdhci-dove.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int sdhci_dove_probe(struct platform_device *pdev) 
		gpio_direction_input(priv->gpio_cd);

	}



	host = sdhci_pltfm_init(pdev, &sdhci_dove_pdata);

	host = sdhci_pltfm_init(pdev, &sdhci_dove_pdata, 0);

	if (IS_ERR(host)) {

		ret = PTR_ERR(host);

		goto err_sdhci_pltfm_init;

drivers/mmc/host/sdhci-esdhc-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	int err;

	struct pltfm_imx_data *imx_data;



	host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata);

	host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata, 0);

	if (IS_ERR(host))

		return PTR_ERR(host);

drivers/mmc/host/sdhci-of-esdhc.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static const struct sdhci_pltfm_data sdhci_esdhc_pdata = { 


static int sdhci_esdhc_probe(struct platform_device *pdev)

{

	return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);

	return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata, 0);

}



static int sdhci_esdhc_remove(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE