Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi

1 files changed, 16 insertions, 30 deletions

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 90c81b3f3431..587722495cf2 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -300,7 +300,7 @@ static int qspi_set_config_register(const struct rspi_data *rspi,
                 spcmd = SPCMD_SPB_8BIT;
         else if (access_size == 16)
                 spcmd = SPCMD_SPB_16BIT;
-        else if (access_size == 32)
+        else
                 spcmd = SPCMD_SPB_32BIT;
 
         spcmd |= SPCMD_SCKDEN | SPCMD_SLNDEN | rspi->spcmd | SPCMD_SPNDEN;
@@ -922,14 +922,9 @@ static void rspi_release_dma(struct rspi_data *rspi)
 
 static int rspi_remove(struct platform_device *pdev)
 {
-        struct rspi_data *rspi = spi_master_get(platform_get_drvdata(pdev));
+        struct rspi_data *rspi = platform_get_drvdata(pdev);
 
-        spi_unregister_master(rspi->master);
         rspi_release_dma(rspi);
-        free_irq(platform_get_irq(pdev, 0), rspi);
-        clk_put(rspi->clk);
-        iounmap(rspi->addr);
-        spi_master_put(rspi->master);
 
         return 0;
 }
@@ -951,12 +946,6 @@ static int rspi_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "there is no set_config_register\n");
                 return -ENODEV;
         }
-        /* get base addr */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (unlikely(res == NULL)) {
-                dev_err(&pdev->dev, "invalid resource\n");
-                return -EINVAL;
-        }
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
@@ -974,19 +963,20 @@ static int rspi_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, rspi);
         rspi->ops = ops;
         rspi->master = master;
-        rspi->addr = ioremap(res->start, resource_size(res));
-        if (rspi->addr == NULL) {
-                dev_err(&pdev->dev, "ioremap error.\n");
-                ret = -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rspi->addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(rspi->addr)) {
+                ret = PTR_ERR(rspi->addr);
                 goto error1;
         }
 
         snprintf(clk_name, sizeof(clk_name), "%s%d", id_entry->name, pdev->id);
-        rspi->clk = clk_get(&pdev->dev, clk_name);
+        rspi->clk = devm_clk_get(&pdev->dev, clk_name);
         if (IS_ERR(rspi->clk)) {
                 dev_err(&pdev->dev, "cannot get clock\n");
                 ret = PTR_ERR(rspi->clk);
-                goto error2;
+                goto error1;
         }
         clk_enable(rspi->clk);
 
@@ -1005,36 +995,32 @@ static int rspi_probe(struct platform_device *pdev)
         master->cleanup = rspi_cleanup;
         master->mode_bits = SPI_CPHA | SPI_CPOL;
 
-        ret = request_irq(irq, rspi_irq, 0, dev_name(&pdev->dev), rspi);
+        ret = devm_request_irq(&pdev->dev, irq, rspi_irq, 0,
+                               dev_name(&pdev->dev), rspi);
         if (ret < 0) {
                 dev_err(&pdev->dev, "request_irq error\n");
-                goto error3;
+                goto error1;
         }
 
         rspi->irq = irq;
         ret = rspi_request_dma(rspi, pdev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "rspi_request_dma failed.\n");
-                goto error4;
+                goto error2;
         }
 
-        ret = spi_register_master(master);
+        ret = devm_spi_register_master(&pdev->dev, master);
         if (ret < 0) {
                 dev_err(&pdev->dev, "spi_register_master error.\n");
-                goto error4;
+                goto error2;
         }
 
         dev_info(&pdev->dev, "probed\n");
 
         return 0;
 
-error4:
-        rspi_release_dma(rspi);
-        free_irq(irq, rspi);
-error3:
-        clk_put(rspi->clk);
 error2:
-        iounmap(rspi->addr);
+        rspi_release_dma(rspi);
 error1:
         spi_master_put(master);