1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 19c65c43cbc5..cfdbb422a40a 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -887,7 +887,6 @@ static int rspi_remove(struct platform_device *pdev)
 {
         struct rspi_data *rspi = platform_get_drvdata(pdev);
 
-        spi_unregister_master(rspi->master);
         rspi_release_dma(rspi);
 
         return 0;
@@ -972,7 +971,7 @@ static int rspi_probe(struct platform_device *pdev)
                 goto error2;
         }
 
-        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 error2;