spi: sh-hspi: use devm_spi_register_master()
authorJingoo Han <jg1.han@samsung.com>
Tue, 24 Sep 2013 04:47:59 +0000 (13:47 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 10:42:53 +0000 (11:42 +0100)
Use devm_spi_register_master() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-sh-hspi.c

index 0b68cb5..97e913d 100644 (file)
@@ -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;
 }