diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 15:02:26 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 15:02:26 +0400 |
| commit | dabefd56c6ee883bae0bdce4d5396c3f21286ab8 (patch) | |
| tree | 2f629a4cfa71276b4afe947232f934f9b0887e7d /drivers/spi/spi-ti-qspi.c | |
| parent | 3b3a80019ff194e86e740ec2f013a8915efd1ccf (diff) | |
| parent | 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff) | |
| download | linux-dabefd56c6ee883bae0bdce4d5396c3f21286ab8.tar.xz | |
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
Conflicts:
drivers/spi/spi-ti-qspi.c
Diffstat (limited to 'drivers/spi/spi-ti-qspi.c')
| -rw-r--r-- | drivers/spi/spi-ti-qspi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index a61aeb9bb823..0b71270fbf67 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -504,7 +504,7 @@ static int ti_qspi_probe(struct platform_device *pdev) if (!of_property_read_u32(np, "spi-max-frequency", &max_freq)) qspi->spi_max_frequency = max_freq; - ret = spi_register_master(master); + ret = devm_spi_register_master(&pdev->dev, master); if (ret) goto free_master; @@ -520,7 +520,6 @@ static int ti_qspi_remove(struct platform_device *pdev) struct ti_qspi *qspi = platform_get_drvdata(pdev); ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG); - spi_unregister_master(qspi->master); return 0; } @@ -531,7 +530,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = { static struct platform_driver ti_qspi_driver = { .probe = ti_qspi_probe, - .remove = ti_qspi_remove, + .remove = ti_qspi_remove, .driver = { .name = "ti,dra7xxx-qspi", .owner = THIS_MODULE, |