diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
| commit | dabefd56c6ee883bae0bdce4d5396c3f21286ab8 (patch) | |
| tree | 2f629a4cfa71276b4afe947232f934f9b0887e7d /drivers/spi/spi-orion.c | |
| parent | 3b3a80019ff194e86e740ec2f013a8915efd1ccf (diff) | |
| parent | 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff) | |
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
Conflicts:
drivers/spi/spi-ti-qspi.c
Diffstat (limited to 'drivers/spi/spi-orion.c')
| -rw-r--r-- | drivers/spi/spi-orion.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index 1d1d321d90c..d96d67869d7 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -457,7 +457,7 @@ static int orion_spi_probe(struct platform_device *pdev) goto out_rel_clk; master->dev.of_node = pdev->dev.of_node; - status = spi_register_master(master); + status = devm_spi_register_master(&pdev->dev, master); if (status < 0) goto out_rel_clk; @@ -483,8 +483,6 @@ static int orion_spi_remove(struct platform_device *pdev) clk_disable_unprepare(spi->clk); clk_put(spi->clk); - spi_unregister_master(master); - return 0; } |