From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 6 Feb 2014 02:52:21 +0000 (+0800)
Subject: spi: davinci: Remove unneeded NULL checking for dspi and dspi->bitbang.master
X-Git-Tag: firefly_0821_release~176^2~4201^2~6^7~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91cfe7e73b484703baf353d3915823210a417d77;p=firefly-linux-kernel-4.4.55.git

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 5e7389faa2a0..04d69b650328 100644
--- 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)) {