spi: s3c24xx: Switch to use devm_spi_alloc_master()

Switch to use devm_spi_alloc_master() to simpify error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220920142216.3002291-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 660aa86..ef25b5e 100644 (file)
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -449,7 +449,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
        struct spi_master *master;
        int err = 0;
 
-       master = spi_alloc_master(&pdev->dev, sizeof(struct s3c24xx_spi));
+       master = devm_spi_alloc_master(&pdev->dev, sizeof(struct s3c24xx_spi));
        if (master == NULL) {
                dev_err(&pdev->dev, "No memory for spi_master\n");
                return -ENOMEM;
@@ -463,8 +463,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
 
        if (pdata == NULL) {
                dev_err(&pdev->dev, "No platform data supplied\n");
-               err = -ENOENT;
-               goto err_no_pdata;
+               return -ENOENT;
        }
 
        platform_set_drvdata(pdev, hw);
@@ -499,29 +498,24 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
 
        /* find and map our resources */
        hw->regs = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(hw->regs)) {
-               err = PTR_ERR(hw->regs);
-               goto err_no_pdata;
-       }
+       if (IS_ERR(hw->regs))
+               return PTR_ERR(hw->regs);
 
        hw->irq = platform_get_irq(pdev, 0);
-       if (hw->irq < 0) {
-               err = -ENOENT;
-               goto err_no_pdata;
-       }
+       if (hw->irq < 0)
+               return -ENOENT;
 
        err = devm_request_irq(&pdev->dev, hw->irq, s3c24xx_spi_irq, 0,
                                pdev->name, hw);
        if (err) {
                dev_err(&pdev->dev, "Cannot claim IRQ\n");
-               goto err_no_pdata;
+               return err;
        }
 
        hw->clk = devm_clk_get(&pdev->dev, "spi");
        if (IS_ERR(hw->clk)) {
                dev_err(&pdev->dev, "No clock for device\n");
-               err = PTR_ERR(hw->clk);
-               goto err_no_pdata;
+               return PTR_ERR(hw->clk);
        }
 
        s3c24xx_spi_initialsetup(hw);
@@ -539,8 +533,6 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
  err_register:
        clk_disable(hw->clk);
 
- err_no_pdata:
-       spi_master_put(hw->master);
        return err;
 }