Merge 3.5-rc7 into char-misc-next.

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci-spear.c

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 6dfa82e03c7e4964bff24a7e3fb9eb92468cd0d0..423da8194cd84e5597c169316311a5ff9629b845 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -4,7 +4,7 @@
  * Support of SDHCI platform devices for spear soc family
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * Inspired by sdhci-pltfm.c
  *
@@ -75,8 +75,6 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
        struct spear_sdhci *sdhci;
        int ret;
 
-       BUG_ON(pdev == NULL);
-
        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!iomem) {
                ret = -ENOMEM;
@@ -84,18 +82,18 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
                goto err;
        }
 
-       if (!request_mem_region(iomem->start, resource_size(iomem),
-                               "spear-sdhci")) {
+       if (!devm_request_mem_region(&pdev->dev, iomem->start,
+                               resource_size(iomem), "spear-sdhci")) {
                ret = -EBUSY;
                dev_dbg(&pdev->dev, "cannot request region\n");
                goto err;
        }
 
-       sdhci = kzalloc(sizeof(*sdhci), GFP_KERNEL);
+       sdhci = devm_kzalloc(&pdev->dev, sizeof(*sdhci), GFP_KERNEL);
        if (!sdhci) {
                ret = -ENOMEM;
                dev_dbg(&pdev->dev, "cannot allocate memory for sdhci\n");
-               goto err_kzalloc;
+               goto err;
        }
 
        /* clk enable */
@@ -103,13 +101,13 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
        if (IS_ERR(sdhci->clk)) {
                ret = PTR_ERR(sdhci->clk);
                dev_dbg(&pdev->dev, "Error getting clock\n");
-               goto err_clk_get;
+               goto err;
        }
 
        ret = clk_enable(sdhci->clk);
        if (ret) {
                dev_dbg(&pdev->dev, "Error enabling clock\n");
-               goto err_clk_enb;
+               goto put_clk;
        }
 
        /* overwrite platform_data */
@@ -124,7 +122,7 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
        if (IS_ERR(host)) {
                ret = PTR_ERR(host);
                dev_dbg(&pdev->dev, "error allocating host\n");
-               goto err_alloc_host;
+               goto disable_clk;
        }
 
        host->hw_name = "sdhci";
@@ -132,17 +130,18 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
        host->irq = platform_get_irq(pdev, 0);
        host->quirks = SDHCI_QUIRK_BROKEN_ADMA;
 
-       host->ioaddr = ioremap(iomem->start, resource_size(iomem));
+       host->ioaddr = devm_ioremap(&pdev->dev, iomem->start,
+                       resource_size(iomem));
        if (!host->ioaddr) {
                ret = -ENOMEM;
                dev_dbg(&pdev->dev, "failed to remap registers\n");
-               goto err_ioremap;
+               goto free_host;
        }
 
        ret = sdhci_add_host(host);
        if (ret) {
                dev_dbg(&pdev->dev, "error adding host\n");
-               goto err_add_host;
+               goto free_host;
        }
 
        platform_set_drvdata(pdev, host);
@@ -161,11 +160,12 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
        if (sdhci->data->card_power_gpio >= 0) {
                int val = 0;
 
-               ret = gpio_request(sdhci->data->card_power_gpio, "sdhci");
+               ret = devm_gpio_request(&pdev->dev,
+                               sdhci->data->card_power_gpio, "sdhci");
                if (ret < 0) {
                        dev_dbg(&pdev->dev, "gpio request fail: %d\n",
                                        sdhci->data->card_power_gpio);
-                       goto err_pgpio_request;
+                       goto set_drvdata;
                }
 
                if (sdhci->data->power_always_enb)
@@ -177,60 +177,48 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
                if (ret) {
                        dev_dbg(&pdev->dev, "gpio set direction fail: %d\n",
                                        sdhci->data->card_power_gpio);
-                       goto err_pgpio_direction;
+                       goto set_drvdata;
                }
        }
 
        if (sdhci->data->card_int_gpio >= 0) {
-               ret = gpio_request(sdhci->data->card_int_gpio, "sdhci");
+               ret = devm_gpio_request(&pdev->dev, sdhci->data->card_int_gpio,
+                               "sdhci");
                if (ret < 0) {
                        dev_dbg(&pdev->dev, "gpio request fail: %d\n",
                                        sdhci->data->card_int_gpio);
-                       goto err_igpio_request;
+                       goto set_drvdata;
                }
 
                ret = gpio_direction_input(sdhci->data->card_int_gpio);
                if (ret) {
                        dev_dbg(&pdev->dev, "gpio set direction fail: %d\n",
                                        sdhci->data->card_int_gpio);
-                       goto err_igpio_direction;
+                       goto set_drvdata;
                }
-               ret = request_irq(gpio_to_irq(sdhci->data->card_int_gpio),
+               ret = devm_request_irq(&pdev->dev,
+                               gpio_to_irq(sdhci->data->card_int_gpio),
                                sdhci_gpio_irq, IRQF_TRIGGER_LOW,
                                mmc_hostname(host->mmc), pdev);
                if (ret) {
                        dev_dbg(&pdev->dev, "gpio request irq fail: %d\n",
                                        sdhci->data->card_int_gpio);
-                       goto err_igpio_request_irq;
+                       goto set_drvdata;
                }
 
        }
 
        return 0;
 
-err_igpio_request_irq:
-err_igpio_direction:
-       if (sdhci->data->card_int_gpio >= 0)
-               gpio_free(sdhci->data->card_int_gpio);
-err_igpio_request:
-err_pgpio_direction:
-       if (sdhci->data->card_power_gpio >= 0)
-               gpio_free(sdhci->data->card_power_gpio);
-err_pgpio_request:
+set_drvdata:
        platform_set_drvdata(pdev, NULL);
        sdhci_remove_host(host, 1);
-err_add_host:
-       iounmap(host->ioaddr);
-err_ioremap:
+free_host:
        sdhci_free_host(host);
-err_alloc_host:
+disable_clk:
        clk_disable(sdhci->clk);
-err_clk_enb:
+put_clk:
        clk_put(sdhci->clk);
-err_clk_get:
-       kfree(sdhci);
-err_kzalloc:
-       release_mem_region(iomem->start, resource_size(iomem));
 err:
        dev_err(&pdev->dev, "spear-sdhci probe failed: %d\n", ret);
        return ret;
@@ -239,35 +227,19 @@ err:
 static int __devexit sdhci_remove(struct platform_device *pdev)
 {
        struct sdhci_host *host = platform_get_drvdata(pdev);
-       struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
-       int dead;
+       int dead = 0;
        u32 scratch;
 
-       if (sdhci->data) {
-               if (sdhci->data->card_int_gpio >= 0) {
-                       free_irq(gpio_to_irq(sdhci->data->card_int_gpio), pdev);
-                       gpio_free(sdhci->data->card_int_gpio);
-               }
-
-               if (sdhci->data->card_power_gpio >= 0)
-                       gpio_free(sdhci->data->card_power_gpio);
-       }
-
        platform_set_drvdata(pdev, NULL);
-       dead = 0;
        scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
        if (scratch == (u32)-1)
                dead = 1;
 
        sdhci_remove_host(host, dead);
-       iounmap(host->ioaddr);
        sdhci_free_host(host);
        clk_disable(sdhci->clk);
        clk_put(sdhci->clk);
-       kfree(sdhci);
-       if (iomem)
-               release_mem_region(iomem->start, resource_size(iomem));
 
        return 0;
 }
@@ -317,5 +289,5 @@ static struct platform_driver sdhci_driver = {
 module_platform_driver(sdhci_driver);
 
 MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_LICENSE("GPL v2");