spi: spi-geni-qcom: Grow a dev pointer to simplify code

Some lines are long here. Use a struct dev pointer to shorten lines and
simplify code. The clk_get() call can fail because of EPROBE_DEFER
problems too, so just remove the error print message because it isn't
useful.

Cc: Girish Mahadevan <girishm@codeaurora.org>
Cc: Dilip Kota <dkota@codeaurora.org>
Cc: Alok Chauhan <alokc@codeaurora.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20200204191206.97036-3-swboyd@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 46e501f..f0ca7f5 100644 (file)
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -536,6 +536,7 @@ static int spi_geni_probe(struct platform_device *pdev)
        struct spi_geni_master *mas;
        void __iomem *base;
        struct clk *clk;
+       struct device *dev = &pdev->dev;
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
@@ -545,28 +546,25 @@ static int spi_geni_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       clk = devm_clk_get(&pdev->dev, "se");
-       if (IS_ERR(clk)) {
-               dev_err(&pdev->dev, "Err getting SE Core clk %ld\n",
-                                               PTR_ERR(clk));
+       clk = devm_clk_get(dev, "se");
+       if (IS_ERR(clk))
                return PTR_ERR(clk);
-       }
 
-       spi = spi_alloc_master(&pdev->dev, sizeof(*mas));
+       spi = spi_alloc_master(dev, sizeof(*mas));
        if (!spi)
                return -ENOMEM;
 
        platform_set_drvdata(pdev, spi);
        mas = spi_master_get_devdata(spi);
        mas->irq = irq;
-       mas->dev = &pdev->dev;
-       mas->se.dev = &pdev->dev;
-       mas->se.wrapper = dev_get_drvdata(pdev->dev.parent);
+       mas->dev = dev;
+       mas->se.dev = dev;
+       mas->se.wrapper = dev_get_drvdata(dev->parent);
        mas->se.base = base;
        mas->se.clk = clk;
 
        spi->bus_num = -1;
-       spi->dev.of_node = pdev->dev.of_node;
+       spi->dev.of_node = dev->of_node;
        spi->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP | SPI_CS_HIGH;
        spi->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
        spi->num_chipselect = 4;
@@ -579,13 +577,13 @@ static int spi_geni_probe(struct platform_device *pdev)
 
        init_completion(&mas->xfer_done);
        spin_lock_init(&mas->lock);
-       pm_runtime_enable(&pdev->dev);
+       pm_runtime_enable(dev);
 
        ret = spi_geni_init(mas);
        if (ret)
                goto spi_geni_probe_runtime_disable;
 
-       ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(&pdev->dev), spi);
+       ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(dev), spi);
        if (ret)
                goto spi_geni_probe_runtime_disable;
 
@@ -597,7 +595,7 @@ static int spi_geni_probe(struct platform_device *pdev)
 spi_geni_probe_free_irq:
        free_irq(mas->irq, spi);
 spi_geni_probe_runtime_disable:
-       pm_runtime_disable(&pdev->dev);
+       pm_runtime_disable(dev);
        spi_master_put(spi);
        return ret;
 }