diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-09-24 00:37:23 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-26 06:42:35 -0400 |
commit | 5c4c5c7be116b0cce2e71173158060afac4144d0 (patch) | |
tree | 03b3082b6be0136825336f14558b3c41b475ee95 /drivers/spi/spi-omap-100k.c | |
parent | 22ad2d8df77d1e88996d0e8f1c04db65f235a778 (diff) |
spi: omap-100k: use devm_spi_register_master()
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>
Diffstat (limited to 'drivers/spi/spi-omap-100k.c')
-rw-r--r-- | drivers/spi/spi-omap-100k.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 69ecf05757dd..b6ed82beb01d 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c | |||
@@ -457,7 +457,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) | |||
457 | goto err; | 457 | goto err; |
458 | } | 458 | } |
459 | 459 | ||
460 | status = spi_register_master(master); | 460 | status = devm_spi_register_master(&pdev->dev, master); |
461 | if (status < 0) | 461 | if (status < 0) |
462 | goto err; | 462 | goto err; |
463 | 463 | ||
@@ -485,8 +485,6 @@ static int omap1_spi100k_remove(struct platform_device *pdev) | |||
485 | 485 | ||
486 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 486 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
487 | 487 | ||
488 | spi_unregister_master(master); | ||
489 | |||
490 | return 0; | 488 | return 0; |
491 | } | 489 | } |
492 | 490 | ||