From: Jingoo Han Date: Tue, 24 Sep 2013 04:30:41 +0000 (+0900) Subject: spi: ep93xx: use devm_spi_register_master() X-Git-Tag: v3.13-rc1~123^2~9^2^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=434eaf3b231125c73450bbc6ebe2396b9b63aa2f;p=kernel%2Fkernel-generic.git spi: ep93xx: use devm_spi_register_master() Use devm_spi_register_master() to make cleanup paths simpler. Signed-off-by: Jingoo Han Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index d22c00a..486fb6d 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -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; }