diff options
author | Axel Lin <axel.lin@ingics.com> | 2016-04-26 06:53:12 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-26 06:56:09 -0400 |
commit | 71c5e53b42f3641f6066c34b2c060dfe64d0ac2e (patch) | |
tree | 36f0f80bfe03c8c9feef1f4c28a8a8b2005d50ae | |
parent | 83835fb07836eac1b35e98b919bf757ff7f77aad (diff) |
spi: Drop duplicate code to set master->dev.parent
It's done by spi_alloc_master().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-axi-spi-engine.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi-dln2.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index c968ab210a51..2b1456e5e221 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c | |||
@@ -525,7 +525,6 @@ static int spi_engine_probe(struct platform_device *pdev) | |||
525 | if (ret) | 525 | if (ret) |
526 | goto err_ref_clk_disable; | 526 | goto err_ref_clk_disable; |
527 | 527 | ||
528 | master->dev.parent = &pdev->dev; | ||
529 | master->dev.of_node = pdev->dev.of_node; | 528 | master->dev.of_node = pdev->dev.of_node; |
530 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; | 529 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; |
531 | master->bits_per_word_mask = SPI_BPW_MASK(8); | 530 | master->bits_per_word_mask = SPI_BPW_MASK(8); |
diff --git a/drivers/spi/spi-dln2.c b/drivers/spi/spi-dln2.c index 4e8a8629d514..b62a99caacc0 100644 --- a/drivers/spi/spi-dln2.c +++ b/drivers/spi/spi-dln2.c | |||
@@ -701,7 +701,6 @@ static int dln2_spi_probe(struct platform_device *pdev) | |||
701 | } | 701 | } |
702 | 702 | ||
703 | dln2->master = master; | 703 | dln2->master = master; |
704 | dln2->master->dev.parent = dev; | ||
705 | dln2->master->dev.of_node = dev->of_node; | 704 | dln2->master->dev.of_node = dev->of_node; |
706 | dln2->pdev = pdev; | 705 | dln2->pdev = pdev; |
707 | dln2->port = pdata->port; | 706 | dln2->port = pdata->port; |
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 85e59a406a4c..e48320667b37 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -1543,7 +1543,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) | |||
1543 | drv_data->pdev = pdev; | 1543 | drv_data->pdev = pdev; |
1544 | drv_data->ssp = ssp; | 1544 | drv_data->ssp = ssp; |
1545 | 1545 | ||
1546 | master->dev.parent = &pdev->dev; | ||
1547 | master->dev.of_node = pdev->dev.of_node; | 1546 | master->dev.of_node = pdev->dev.of_node; |
1548 | /* the spi->mode bits understood by this driver: */ | 1547 | /* the spi->mode bits understood by this driver: */ |
1549 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; | 1548 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; |