Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d09da11 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/pdata' into spi-next

parents 1728ddb2 24b5a82c

drivers/spi/spi-davinci.c

+2 −2
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static int davinci_spi_probe(struct platform_device *pdev) 
		goto err;

	}



	dev_set_drvdata(&pdev->dev, master);

	platform_set_drvdata(pdev, master);



	dspi = spi_master_get_devdata(master);

	if (dspi == NULL) {
@@ -1044,7 +1044,7 @@ static int davinci_spi_remove(struct platform_device *pdev) 
	struct spi_master *master;

	struct resource *r;



	master = dev_get_drvdata(&pdev->dev);

	master = platform_get_drvdata(pdev);

	dspi = spi_master_get_devdata(master);



	spi_bitbang_stop(&dspi->bitbang);

drivers/spi/spi-fsl-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) 


static int of_fsl_spi_remove(struct platform_device *ofdev)

{

	struct spi_master *master = dev_get_drvdata(&ofdev->dev);

	struct spi_master *master = platform_get_drvdata(ofdev);

	struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master);

	int ret;

drivers/spi/spi-mpc52xx-psc.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int mpc52xx_psc_spi_of_probe(struct platform_device *op) 


static int mpc52xx_psc_spi_of_remove(struct platform_device *op)

{

	struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));

	struct spi_master *master = spi_master_get(platform_get_drvdata(op));

	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master);



	flush_workqueue(mps->workqueue);

drivers/spi/spi-mpc52xx.c

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int mpc52xx_spi_probe(struct platform_device *op) 
	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;

	master->dev.of_node = op->dev.of_node;



	dev_set_drvdata(&op->dev, master);

	platform_set_drvdata(op, master);



	ms = spi_master_get_devdata(master);

	ms->master = master;
@@ -529,7 +529,7 @@ static int mpc52xx_spi_probe(struct platform_device *op) 


static int mpc52xx_spi_remove(struct platform_device *op)

{

	struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));

	struct spi_master *master = spi_master_get(platform_get_drvdata(op));

	struct mpc52xx_spi *ms = spi_master_get_devdata(master);

	int i;

drivers/spi/spi-omap-100k.c

+2 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) 
	master->mode_bits = MODEBITS;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);



	dev_set_drvdata(&pdev->dev, master);

	platform_set_drvdata(pdev, master);



	spi100k = spi_master_get_devdata(master);

	spi100k->master = master;
@@ -561,7 +561,7 @@ static int omap1_spi100k_remove(struct platform_device *pdev) 
	unsigned long		flags;

	int			status = 0;



	master = dev_get_drvdata(&pdev->dev);

	master = platform_get_drvdata(pdev);

	spi100k = spi_master_get_devdata(master);



	spin_lock_irqsave(&spi100k->lock, flags);