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

Commit 68aa4cb3 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 11c28cfc b5f9a9d5

drivers/spi/spi-altera.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev) 


static int altera_spi_probe(struct platform_device *pdev)

{

	struct altera_spi_platform_data *platp = pdev->dev.platform_data;

	struct altera_spi_platform_data *platp = dev_get_platdata(&pdev->dev);

	struct altera_spi *hw;

	struct spi_master *master;

	struct resource *res;

drivers/spi/spi-ath79.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int ath79_spi_probe(struct platform_device *pdev) 
	sp = spi_master_get_devdata(master);

	platform_set_drvdata(pdev, sp);



	pdata = pdev->dev.platform_data;

	pdata = dev_get_platdata(&pdev->dev);



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

	master->setup = ath79_spi_setup;

drivers/spi/spi-au1550.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int au1550_spi_probe(struct platform_device *pdev) 
	hw = spi_master_get_devdata(master);



	hw->master = spi_master_get(master);

	hw->pdata = pdev->dev.platform_data;

	hw->pdata = dev_get_platdata(&pdev->dev);

	hw->dev = &pdev->dev;



	if (hw->pdata == NULL) {

drivers/spi/spi-bcm63xx.c

+3 −5
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
{

	struct resource *r;

	struct device *dev = &pdev->dev;

	struct bcm63xx_spi_pdata *pdata = pdev->dev.platform_data;

	struct bcm63xx_spi_pdata *pdata = dev_get_platdata(&pdev->dev);

	int irq;

	struct spi_master *master;

	struct clk *clk;
@@ -474,8 +474,7 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM

static int bcm63xx_spi_suspend(struct device *dev)

{

	struct spi_master *master =

			platform_get_drvdata(to_platform_device(dev));

	struct spi_master *master = dev_get_drvdata(dev);

	struct bcm63xx_spi *bs = spi_master_get_devdata(master);



	spi_master_suspend(master);
@@ -487,8 +486,7 @@ static int bcm63xx_spi_suspend(struct device *dev) 


static int bcm63xx_spi_resume(struct device *dev)

{

	struct spi_master *master =

			platform_get_drvdata(to_platform_device(dev));

	struct spi_master *master = dev_get_drvdata(dev);

	struct bcm63xx_spi *bs = spi_master_get_devdata(master);



	clk_prepare_enable(bs->clk);

drivers/spi/spi-bfin-sport.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static int bfin_sport_spi_probe(struct platform_device *pdev) 
	struct bfin_sport_spi_master_data *drv_data;

	int status;



	platform_info = dev->platform_data;

	platform_info = dev_get_platdata(dev);



	/* Allocate master with space for drv_data */

	master = spi_alloc_master(dev, sizeof(*master) + 16);