Merge remote-tracking branch 'spi/topic/orion' into spi-next

[deliverable/linux.git] / drivers / spi / spi-orion.c

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index c6caed3c462556b7dc80f6313af837c75a1b2ab3..744841e095e4be7d4a8b7e6f057b2bed2915cf9a 100644 (file)
--- 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;
 }