spi: davinci: Remove unneeded NULL checking for dspi and dspi->bitbang.master

spi_master_get_devdata() never returns NULL when spi_alloc_master() success,
so remove NULL test for dspi.
We have ensured master is not NULL before assigning it to dspi->bitbang.master.
So also remove NULL test for dspi->bitbang.master.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 5e7389faa2a0189472d71fedcba95ae8ecd1cf35..04d69b6503282c05fd398f7d1f2c30344c4af155 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -864,10 +864,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, master);
 
        dspi = spi_master_get_devdata(master);
-       if (dspi == NULL) {
-               ret = -ENOENT;
-               goto free_master;
-       }
 
        if (dev_get_platdata(&pdev->dev)) {
                pdata = dev_get_platdata(&pdev->dev);
@@ -908,10 +904,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
                goto free_master;
 
        dspi->bitbang.master = master;
-       if (dspi->bitbang.master == NULL) {
-               ret = -ENODEV;
-               goto free_master;
-       }
 
        dspi->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(dspi->clk)) {