Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d4dc338 authored by Thomas Abraham's avatar Thomas Abraham Committed by Chris Ball
Browse files

mmc: sdhci-s3c: Keep a copy of platform data and use it 



The platform data is copied into driver's private data and the copy is
used for all access to the platform data. This simpifies the addition
of device tree support for the sdhci-s3c driver.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 0d22c770

drivers/mmc/host/sdhci-s3c.c

+9 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data( 


static int __devinit sdhci_s3c_probe(struct platform_device *pdev)

{

	struct s3c_sdhci_platdata *pdata = pdev->dev.platform_data;

	struct s3c_sdhci_platdata *pdata;

	struct sdhci_s3c_drv_data *drv_data;

	struct device *dev = &pdev->dev;

	struct sdhci_host *host;
@@ -432,7 +432,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret, irq, ptr, clks;



	if (!pdata) {

	if (!pdev->dev.platform_data) {

		dev_err(dev, "no device data specified\n");

		return -ENOENT;

	}
@@ -455,6 +455,13 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
		return PTR_ERR(host);

	}



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata) {

		ret = -ENOMEM;

		goto err_io_clk;

	}

	memcpy(pdata, pdev->dev.platform_data, sizeof(*pdata));



	drv_data = sdhci_s3c_get_driver_data(pdev);

	sc = sdhci_priv(host);