diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-30 20:58:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-30 20:58:56 +0200 |
| commit | 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0 (patch) | |
| tree | 16d625cdf57212c70b2eae5d86e3924ff3116031 /drivers/spi/spi-falcon.c | |
| parent | spi: sh-msiof: Add DMA support (diff) | |
| parent | spi: sh-hspi: Make of_device_id array const (diff) | |
| download | linux-19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0.tar.xz linux-19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0.zip | |
Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof
Conflicts:
drivers/spi/spi-sh-msiof.c
Diffstat (limited to 'drivers/spi/spi-falcon.c')
| -rw-r--r-- | drivers/spi/spi-falcon.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c index ba441ad9a007..f73b3004d6d3 100644 --- a/drivers/spi/spi-falcon.c +++ b/drivers/spi/spi-falcon.c @@ -425,8 +425,6 @@ static int falcon_sflash_probe(struct platform_device *pdev) master->unprepare_transfer_hardware = falcon_sflash_unprepare_xfer; master->dev.of_node = pdev->dev.of_node; - platform_set_drvdata(pdev, priv); - ret = devm_spi_register_master(&pdev->dev, master); if (ret) spi_master_put(master); |