]> git.karo-electronics.de Git - linux-beck.git/commitdiff
spi: ep93xx: use devm_spi_register_master()
authorJingoo Han <jg1.han@samsung.com>
Tue, 24 Sep 2013 04:30:41 +0000 (13:30 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 10:42:32 +0000 (11:42 +0100)
Use devm_spi_register_master() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-ep93xx.c

index d22c00a227b683ea22b404d680575ae4a27efc9e..486fb6deab05b0f71aedf1858c8fcd0e892a1496 100644 (file)
@@ -942,7 +942,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
        /* make sure that the hardware is disabled */
        ep93xx_spi_write_u8(espi, SSPCR1, 0);
 
-       error = spi_register_master(master);
+       error = devm_spi_register_master(&pdev->dev, master);
        if (error) {
                dev_err(&pdev->dev, "failed to register SPI master\n");
                goto fail_free_dma;
@@ -968,7 +968,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev)
 
        ep93xx_spi_release_dma(espi);
 
-       spi_unregister_master(master);
        return 0;
 }