spi: Drop duplicate code to set master->dev.parent

PATCH In review Axel Lin 2 participants 2 messages Apr 26, 2016 1 message not in the archive

Subsystems (4)

SPI PXA2xx/PXA3xx support Intel LPSS (Low Power SubSystem) drivers AXI SPI engine

lore

Share & tools

lore

Axel Lin

author

2016-04-26 10:53 UTC #0 lore raw

PATCH 1/1 spi: Drop duplicate code to set master->dev.parent

It's done by spi_alloc_master().

Signed-off-by Axel Lin <[email protected]>

---
 drivers/spi/spi-axi-spi-engine.c | 1 -
 drivers/spi/spi-dln2.c           | 1 -
 drivers/spi/spi-pxa2xx.c         | 1 -
 3 files changed, 3 deletions(-)

drivers/spi/spi-axi-spi-engine.c +0 -1

index c968ab2..2b1456e 100644
@@ -525,7 +525,6 @@ static int spi_engine_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_ref_clk_disable;
 
-	master->dev.parent = &pdev->dev;
 	master->dev.of_node = pdev->dev.of_node;
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
 	master->bits_per_word_mask = SPI_BPW_MASK(8);

drivers/spi/spi-dln2.c +0 -1

index 4e8a862..b62a99ca 100644
@@ -701,7 +701,6 @@ static int dln2_spi_probe(struct platform_device *pdev)
 	}
 
 	dln2->master = master;
-	dln2->master->dev.parent = dev;
 	dln2->master->dev.of_node = dev->of_node;
 	dln2->pdev = pdev;
 	dln2->port = pdata->port;

drivers/spi/spi-pxa2xx.c +0 -1

index 0ce82db..c625272 100644
@@ -1548,7 +1548,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
 	drv_data->pdev = pdev;
 	drv_data->ssp = ssp;
 
-	master->dev.parent = &pdev->dev;
 	master->dev.of_node = pdev->dev.of_node;
 	/* the spi->mode bits understood by this driver: */
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;

Signature · 6 lines

2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mark Brown

2016-04-26 11:08 UTC #2 lore raw

Applied "spi: Drop duplicate code to set master->dev.parent" to the spi tree

The patch

spi: Drop duplicate code to set master->dev.parent

has been applied to the spi tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 71c5e53b42f3641f6066c34b2c060dfe64d0ac2e Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Tue, 26 Apr 2016 18:53:12 +0800
Subject: [PATCH] spi: Drop duplicate code to set master->dev.parent