diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:02 -0400 |
| commit | 3d09da11b59ade74502b246782552f9cb1eb59bd (patch) | |
| tree | a5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-omap2-mcspi.c | |
| parent | 1728ddb2ca726b150e7bf10cdd35b5c3fc5efcf3 (diff) | |
| parent | 24b5a82cf5709a4bc577f42fdaa61b23a7f58f08 (diff) | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index e7742134451a..5994039758de 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
| @@ -1324,7 +1324,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
| 1324 | master->cleanup = omap2_mcspi_cleanup; | 1324 | master->cleanup = omap2_mcspi_cleanup; |
| 1325 | master->dev.of_node = node; | 1325 | master->dev.of_node = node; |
| 1326 | 1326 | ||
| 1327 | dev_set_drvdata(&pdev->dev, master); | 1327 | platform_set_drvdata(pdev, master); |
| 1328 | 1328 | ||
| 1329 | mcspi = spi_master_get_devdata(master); | 1329 | mcspi = spi_master_get_devdata(master); |
| 1330 | mcspi->master = master; | 1330 | mcspi->master = master; |
| @@ -1446,7 +1446,7 @@ static int omap2_mcspi_remove(struct platform_device *pdev) | |||
| 1446 | struct omap2_mcspi *mcspi; | 1446 | struct omap2_mcspi *mcspi; |
| 1447 | struct omap2_mcspi_dma *dma_channels; | 1447 | struct omap2_mcspi_dma *dma_channels; |
| 1448 | 1448 | ||
| 1449 | master = dev_get_drvdata(&pdev->dev); | 1449 | master = platform_get_drvdata(pdev); |
| 1450 | mcspi = spi_master_get_devdata(master); | 1450 | mcspi = spi_master_get_devdata(master); |
| 1451 | dma_channels = mcspi->dma_channels; | 1451 | dma_channels = mcspi->dma_channels; |
| 1452 | 1452 | ||