diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 19:21:02 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 19:21:02 +0400 |
| commit | 3d09da11b59ade74502b246782552f9cb1eb59bd (patch) | |
| tree | a5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-omap-100k.c | |
| parent | 1728ddb2ca726b150e7bf10cdd35b5c3fc5efcf3 (diff) | |
| parent | 24b5a82cf5709a4bc577f42fdaa61b23a7f58f08 (diff) | |
| download | linux-3d09da11b59ade74502b246782552f9cb1eb59bd.tar.xz | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-omap-100k.c')
| -rw-r--r-- | drivers/spi/spi-omap-100k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 9137fcc4f99b..ee25670f8cfd 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -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); |