spi: omap-100k: use devm_spi_register_master()
authorJingoo Han <jg1.han@samsung.com>
Tue, 24 Sep 2013 04:37:23 +0000 (13:37 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 10:42:35 +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-omap-100k.c

index 69ecf05..b6ed82b 100644 (file)
@@ -457,7 +457,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
                goto err;
        }
 
-       status = spi_register_master(master);
+       status = devm_spi_register_master(&pdev->dev, master);
        if (status < 0)
                goto err;
 
@@ -485,8 +485,6 @@ static int omap1_spi100k_remove(struct platform_device *pdev)
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       spi_unregister_master(master);
-
        return 0;
 }