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-sh-hspi.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-sh-hspi.c')
-rw-r--r-- | drivers/spi/spi-sh-hspi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 0b68cb592fa..97e913d225f 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c @@ -303,7 +303,7 @@ static int hspi_probe(struct platform_device *pdev) master->mode_bits = SPI_CPOL | SPI_CPHA; master->auto_runtime_pm = true; master->transfer_one_message = hspi_transfer_one_message; - ret = spi_register_master(master); + ret = devm_spi_register_master(&pdev->dev, master); if (ret < 0) { dev_err(&pdev->dev, "spi_register_master error.\n"); goto error1; @@ -328,7 +328,6 @@ static int hspi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); clk_put(hspi->clk); - spi_unregister_master(hspi->master); return 0; } |