1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 5f28ddbe4f7e..67249a48b391 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -272,7 +272,7 @@ static int octeon_spi_probe(struct platform_device *pdev)
         master->bits_per_word_mask = SPI_BPW_MASK(8);
 
         master->dev.of_node = pdev->dev.of_node;
-        err = spi_register_master(master);
+        err = devm_spi_register_master(&pdev->dev, master);
         if (err) {
                 dev_err(&pdev->dev, "register master failed: %d\n", err);
                 goto fail;
@@ -292,8 +292,6 @@ static int octeon_spi_remove(struct platform_device *pdev)
         struct octeon_spi *p = spi_master_get_devdata(master);
         u64 register_base = p->register_base;
 
-        spi_unregister_master(master);
-
         /* Clear the CSENA* and put everything in a known state. */
         cvmx_write_csr(register_base + OCTEON_SPI_CFG, 0);