Merge branch 'signal-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / spi / spi-sh.c

diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index 20bdae5..15123a8 100644 (file)
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -440,7 +440,7 @@ static int spi_sh_probe(struct platform_device *pdev)
        if (irq < 0)
                return irq;
 
-       master = spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data));
+       master = devm_spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data));
        if (master == NULL) {
                dev_err(&pdev->dev, "spi_alloc_master error.\n");
                return -ENOMEM;
@@ -458,16 +458,14 @@ static int spi_sh_probe(struct platform_device *pdev)
                break;
        default:
                dev_err(&pdev->dev, "No support width\n");
-               ret = -ENODEV;
-               goto error1;
+               return -ENODEV;
        }
        ss->irq = irq;
        ss->master = master;
        ss->addr = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (ss->addr == NULL) {
                dev_err(&pdev->dev, "ioremap error.\n");
-               ret = -ENOMEM;
-               goto error1;
+               return -ENOMEM;
        }
        INIT_LIST_HEAD(&ss->queue);
        spin_lock_init(&ss->lock);
@@ -477,7 +475,7 @@ static int spi_sh_probe(struct platform_device *pdev)
        ret = request_irq(irq, spi_sh_irq, 0, "spi_sh", ss);
        if (ret < 0) {
                dev_err(&pdev->dev, "request_irq error\n");
-               goto error1;
+               return ret;
        }
 
        master->num_chipselect = 2;
@@ -496,9 +494,6 @@ static int spi_sh_probe(struct platform_device *pdev)
 
  error3:
        free_irq(irq, ss);
- error1:
-       spi_master_put(master);
-
        return ret;
 }